Merge pull request #28347 from volth/androidndk-wrap-scripts-in-libexec

androidndk: wrap scripts in $out/libexec
This commit is contained in:
Frederik Rietdijk 2017-08-17 19:57:48 +02:00 committed by GitHub
commit 0e95971e5e
2 changed files with 10 additions and 10 deletions

View File

@ -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 = {

View File

@ -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
'';
}