swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed subdirectories in Android SKD's build-tools

Browse source 
Nix unzips the different components of the Android SDK one by one.
It followed the directory structure of complete packages released for
mainstream OS but the names of the directories in build-tools doesn't
match those.
As a result, some programs assuming the usual directory structure and
naming conventions broke (in my case it is a gradle plugin).
This is a fix. It may introduce a regression if some programs rely on
the current behavior.
This commit is contained in:
Yacine Hmito 2016-01-18 00:42:54 +01:00
parent 0f107fcb67
commit 1d8313042d
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