diff options
| author | Robin Gloster <mail@glob.in> | 2019-11-10 00:52:53 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 01:09:25 +0100 |
| commit | 760e23136acfc192fd9a51b6b3c63fbc0a0c999d (patch) | |
| tree | 580b5353463a389247f8225b618091af816e329f /pkgs/development/mobile | |
| parent | 01e8c649889a0a9493a38505023f7e33d98d8446 (diff) | |
| download | nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar.gz nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar.bz2 nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar.lz nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar.xz nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar.zst nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.zip | |
treewide: *inputs are lists
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/androidenv/build-tools.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/mobile/androidenv/platform-tools.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 976ef141627..9e273468cd3 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper ] ++ - lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ]; + lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 5b4cad1f264..c39d966959a 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; + ++ lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib64 autoPatchelf --no-recurse $packageBaseDir/lib64 |