androidndk: wrap scripts in $out/libexec

2 files changed, 10 insertions, 10 deletions

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index c6ee22e4d3cdf..8ef58471d6a04 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -64,6 +64,11 @@ stdenv.mkDerivation rec {
     sed -i -e ${sed_script_2} ndk-which
     # a bash script
     patchShebangs ndk-which
+    # wrap
+    for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
+    do
+        wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
+    done
     # make some executables available in PATH
     mkdir -pv ${bin_path}
     for i in \
@@ -71,11 +76,6 @@ stdenv.mkDerivation rec {
     do
         ln -sf ${pkg_path}/$i ${bin_path}/$i
     done
-    # wrap
-    for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
-    do
-        wrapProgram "${bin_path}/$i" --prefix PATH : "${runtime_paths}"
-    done
   '';
 
     meta = {
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index 4239dc55e7c49..ccf22d6b95364 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -64,6 +64,11 @@ stdenv.mkDerivation rec {
     sed -i -e ${sed_script_2} ndk-which
     # a bash script
     patchShebangs ndk-which
+    # wrap
+    for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
+    do
+        wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
+    done
     # make some executables available in PATH
     mkdir -pv ${bin_path}
     for i in \
@@ -71,10 +76,5 @@ stdenv.mkDerivation rec {
     do
         ln -sf ${pkg_path}/$i ${bin_path}/$i
     done
-    # wrap
-    for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
-    do
-        wrapProgram "${bin_path}/$i" --prefix PATH : "${runtime_paths}"
-    done
   '';
 }