diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/mobile/flashtool/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/apktool/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 601b0b319bc88..f78a10d826631 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }: +{ stdenv, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }: # TODO: # @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux - ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux + ln -s ${platform-tools}/libexec/android-sdk/platform-tools/adb x10flasher_lib/adb.linux + ln -s ${platform-tools}/libexec/android-sdk/platform-tools/fastboot x10flasher_lib/fastboot.linux ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 17b0265fddde3..c811b8a99e911 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, buildTools }: +{ stdenv, fetchurl, makeWrapper, jre, build-tools }: stdenv.mkDerivation rec { name = "apktool-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ --add-flags "-jar $out/libexec/apktool/apktool.jar" \ - --prefix PATH : "${buildTools.v25_0_1}/build-tools/25.0.1/" + --prefix PATH : "${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3" ''; meta = with stdenv.lib; { |