diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 15:53:51 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 22:09:41 +0300 |
commit | 8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e (patch) | |
tree | 8bab721107fae818dad896a0876d50d3d0a0d981 /pkgs/development/mobile/androidenv | |
parent | e26119619f7ce64b065e692ba0cd31f53b9ef637 (diff) | |
download | nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.gz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.bz2 nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.lz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.xz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.zst nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.zip |
replace makeSearchPath tree-wise to take care of possible multiple outputs
Diffstat (limited to 'pkgs/development/mobile/androidenv')
-rw-r--r-- | pkgs/development/mobile/androidenv/androidndk.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 0ae5fc3b5403..63ea07b78a60 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed_script_2 = "'s|^MYNDKDIR=`dirname $0`" + "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeSearchPath "bin" [ + runtime_paths = (lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused jdk diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 428cef49a2d1..1896a615ac1e 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed_script_2 = "'s|^MYNDKDIR=`dirname $0`" + "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeSearchPath "bin" [ + runtime_paths = (lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused jdk |