diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-02 12:10:33 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-02 12:10:33 +0200 |
| commit | b910b697f69cbe44ccc5e4ea56c30a97b47afc52 (patch) | |
| tree | eef88ee5efa19af8c43a69a0393c20ae2cb2ee5f /pkgs/development/mobile/androidenv/default.nix | |
| parent | 542a86037d57e4657919fb5130c7bf819d91d2c3 (diff) | |
| parent | e5bd74879517e6283113d82bec6309b09152f5cd (diff) | |
| download | nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.gz nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.bz2 nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.lz nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.xz nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.zst nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/development/mobile/androidenv/default.nix')
| -rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 4e9f139b95e9..8e108f24088e 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -281,7 +281,7 @@ rec { inherit (buildPackages) makeWrapper; inherit (pkgs) - lib hostPlatform targetPlatform + lib stdenv runCommand wrapBintoolsWith wrapCCWith; # buildPackages.foo rather than buildPackages.buildPackages.foo would work, # but for splicing messing up on infinite recursion for the variants we @@ -297,7 +297,7 @@ rec { inherit (buildPackages) makeWrapper; inherit (pkgs) - lib hostPlatform targetPlatform + lib stdenv runCommand wrapBintoolsWith wrapCCWith; # buildPackages.foo rather than buildPackages.buildPackages.foo would work, # but for splicing messing up on infinite recursion for the variants we |