JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12447 from gpyh/fix-android-build-tools

Browse Source 
Renamed subdirectories in Android SKD's build-tools
This commit is contained in:
Tobias Geerinckx-Rice 2016-01-18 02:35:59 +01:00
commit 5db2412159
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/mobile/androidenv/androidsdk.nix
View File

@ -219,7 +219,7 @@ stdenv.mkDerivation rec {
fi fi
done done
for i in $out/libexec/android-sdk-*/build-tools/android-*/* for i in $out/libexec/android-sdk-*/build-tools/*/*
do do
if [ ! -d $i ] && [ -x $i ] if [ ! -d $i ] && [ -x $i ]
then then

3
pkgs/development/mobile/androidenv/build-tools.nix
View File

@ -18,10 +18,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/build-tools mkdir -p $out/build-tools
cd $out/build-tools cd $out/build-tools
unzip $src unzip $src
mv android-* ${version}
${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
'' ''
cd android-* cd ${version}
# Patch the interpreter # Patch the interpreter
for i in aapt aidl bcc_compat dexdump llvm-rs-cc for i in aapt aidl bcc_compat dexdump llvm-rs-cc