diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/mobile | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/mobile')
12 files changed, 86 insertions, 80 deletions
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index fd78fa9ac0f8..5db3538563f9 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -24,7 +24,8 @@ }: let - inherit (pkgs) stdenv lib fetchurl makeWrapper unzip; + inherit (pkgs) stdenv lib fetchurl; + inherit (pkgs.buildPackages) makeWrapper unzip; # Determine the Android os identifier from Nix's system identifier os = if stdenv.system == "x86_64-linux" then "linux" diff --git a/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix b/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix index e08078ea6725..c8fce166aa7d 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix @@ -5,16 +5,16 @@ deployAndroidPackage { buildInputs = [ autoPatchelfHook makeWrapper ] ++ lib.optional (os == "linux") [ pkgs.glibc - pkgs.xlibs.libX11 - pkgs.xlibs.libXext - pkgs.xlibs.libXdamage - pkgs.xlibs.libXfixes - pkgs.xlibs.libxcb - pkgs.xlibs.libXcomposite - pkgs.xlibs.libXcursor - pkgs.xlibs.libXi - pkgs.xlibs.libXrender - pkgs.xlibs.libXtst + pkgs.xorg.libX11 + pkgs.xorg.libXext + pkgs.xorg.libXdamage + pkgs.xorg.libXfixes + pkgs.xorg.libxcb + pkgs.xorg.libXcomposite + pkgs.xorg.libXcursor + pkgs.xorg.libXi + pkgs.xorg.libXrender + pkgs.xorg.libXtst pkgs.libcxx pkgs.libGL pkgs.libpulseaudio diff --git a/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index f74b949a7b3c..26d6a847b4d0 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -14,10 +14,14 @@ deployAndroidPackage { patchInstructions = lib.optionalString (os == "linux") ('' patchShebangs . + # Fix the shebangs of the auto-generated scripts. + substituteInPlace ./build/tools/make_standalone_toolchain.py \ + --replace '#!/bin/bash' '#!${pkgs.bash}/bin/bash' + '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) '' patch -p1 \ --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} || true - wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + wrapProgram ./build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" '' + '' # TODO: allow this stuff diff --git a/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix b/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix index 0234c9f3d04b..a768a120547f 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix @@ -4,7 +4,7 @@ deployAndroidPackage { name = "androidsdk"; inherit os package; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXrender pkgs.xorg.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.xorg.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' @@ -27,7 +27,7 @@ deployAndroidPackage { # Wrap monitor script wrapProgram $PWD/monitor \ --prefix PATH : ${pkgs.jdk8}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]} # Patch all script shebangs patchShebangs . diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 9c5e10d3a482..6f4522ebf1c9 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.2) - activesupport (5.2.4.4) + CFPropertyList (3.0.3) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -14,10 +14,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.0) + cocoapods (1.10.1) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.0) + cocoapods-core (= 1.10.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -32,7 +32,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.0) + cocoapods-core (1.10.1) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -52,19 +52,19 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.13.1) + ffi (1.15.0) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.8.5) + i18n (1.8.9) concurrent-ruby (~> 1.0) - json (2.3.1) - minitest (5.14.2) + json (2.5.1) + minitest (5.14.4) molinillo (0.6.6) nanaimo (0.3.0) nap (1.1.0) @@ -74,7 +74,7 @@ GEM thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock index d4de7cd698d7..cf718b02c087 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.2) - activesupport (5.2.4.4) + CFPropertyList (3.0.3) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -14,10 +14,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.0) + cocoapods (1.10.1) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.0) + cocoapods-core (= 1.10.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -32,7 +32,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.0) + cocoapods-core (1.10.1) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -52,19 +52,19 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.13.1) + ffi (1.15.0) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.8.5) + i18n (1.8.9) concurrent-ruby (~> 1.0) - json (2.3.1) - minitest (5.14.2) + json (2.5.1) + minitest (5.14.4) molinillo (0.6.6) nanaimo (0.3.0) nap (1.1.0) @@ -74,7 +74,7 @@ GEM thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix index 195f0901a19c..9c18d393bcb9 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; + sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; addressable = { dependencies = ["public_suffix"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf"; + sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; claide = { groups = ["default"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j"; + sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -79,10 +79,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4"; + sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -161,10 +161,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; escape = { groups = ["default"]; @@ -192,10 +192,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.0"; }; fourflusher = { groups = ["default"]; @@ -243,30 +243,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.9"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; molinillo = { groups = ["default"]; @@ -355,10 +355,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix index 732d2a2cdd8d..90c1687aeaba 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix +++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; + sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; addressable = { dependencies = ["public_suffix"]; @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf"; + sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; claide = { groups = ["default"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j"; + sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4"; + sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -153,10 +153,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; escape = { source = { @@ -182,10 +182,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.0"; }; fourflusher = { groups = ["default"]; @@ -229,30 +229,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.9"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; molinillo = { source = { @@ -333,10 +333,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; diff --git a/nixpkgs/pkgs/development/mobile/genymotion/default.nix b/nixpkgs/pkgs/development/mobile/genymotion/default.nix index 5602f598e9d6..1aa81132c260 100644 --- a/nixpkgs/pkgs/development/mobile/genymotion/default.nix +++ b/nixpkgs/pkgs/development/mobile/genymotion/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; }; - buildInputs = [ makeWrapper which xdg-utils ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ which xdg-utils ]; unpackPhase = '' mkdir -p phony-home $out/share/applications diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index f471dc977b3d..89fd34bb5a3d 100644 --- a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildCommand = '' mkdir -p $out diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index 0742247893c3..fb462cc27fe6 100644 --- a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildCommand = '' mkdir -p $out diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix index 965a385ac56c..c207b112fae2 100644 --- a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix +++ b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { } else throw "Platform: ${stdenv.system} not supported!"; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildCommand = '' mkdir -p $out |