mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
Renamed subdirectories in Android SKD's build-tools
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:
parent
0f107fcb67
commit
1d8313042d
@ -219,7 +219,7 @@ stdenv.mkDerivation rec {
|
||||
fi
|
||||
done
|
||||
|
||||
for i in $out/libexec/android-sdk-*/build-tools/android-*/*
|
||||
for i in $out/libexec/android-sdk-*/build-tools/*/*
|
||||
do
|
||||
if [ ! -d $i ] && [ -x $i ]
|
||||
then
|
||||
|
@ -18,10 +18,11 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/build-tools
|
||||
cd $out/build-tools
|
||||
unzip $src
|
||||
mv android-* ${version}
|
||||
|
||||
${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
|
||||
''
|
||||
cd android-*
|
||||
cd ${version}
|
||||
|
||||
# Patch the interpreter
|
||||
for i in aapt aidl bcc_compat dexdump llvm-rs-cc
|
||||
|
Loading…
Reference in New Issue
Block a user