diff options
-rw-r--r-- | pkgs/development/mobile/flashtool/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/apktool/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/scrcpy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/gnirehtet/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
5 files changed, 13 insertions, 17 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; { diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index afe8c0b7b676a..87762eb4b2581 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -3,7 +3,7 @@ , ninja , pkgconfig -, platformTools +, platform-tools , ffmpeg , SDL2 }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar" # runtime dep on `adb` to push the server - wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platformTools}/bin" + wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platform-tools}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index d40b85591b590..69ad0e39c9401 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { patches = [ (substituteAll { src = ./paths.patch; - adb = "${androidenv.platformTools}/bin/adb"; + adb = "${androidenv.androidPkgs_9_0.platform-tools}/bin/adb"; inherit apk; }) ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69446ff6ea7bb..cb4ecf8a574b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -539,7 +539,7 @@ in ansifilter = callPackage ../tools/text/ansifilter {}; apktool = callPackage ../development/tools/apktool { - buildTools = androidenv.buildTools; + inherit (androidenv.androidPkgs_9_0) build-tools; }; appimage-run = callPackage ../tools/package-management/appimage-run {}; @@ -822,7 +822,7 @@ in abootimg = callPackage ../development/mobile/abootimg {}; adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { - adb = androidenv.platformTools; + adb = androidenv.androidPkgs_9_0.platform-tools; }; adb-sync = callPackage ../development/mobile/adb-sync { }; @@ -832,15 +832,11 @@ in #licenseAccepted = (config.android_sdk.accept_license or false); }; - inherit (androidenv) androidndk; - androidndkPkgs = androidndkPkgs_17c; androidndkPkgs_17c = (callPackage ../development/androidndk-pkgs {})."17c"; androidndkPkgs_10e = (callPackage ../development/androidndk-pkgs {})."10e"; - androidsdk = androidenv.androidsdk_8_0; - - androidsdk_extras = res.androidenv.androidsdk_8_0_extras; + androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; webos = recurseIntoAttrs { cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { }; @@ -2678,7 +2674,7 @@ in flamerobin = callPackage ../applications/misc/flamerobin { }; flashtool = pkgsi686Linux.callPackage ../development/mobile/flashtool { - platformTools = androidenv.platformTools; + inherit (androidenv.androidPkgs_9_0) platform-tools; }; flashrom = callPackage ../tools/misc/flashrom { }; @@ -5311,7 +5307,7 @@ in }; scrcpy = callPackage ../misc/scrcpy { - inherit (androidenv) platformTools; + inherit (androidenv.androidPkgs_9_0) platform-tools; }; screen-message = callPackage ../tools/X11/screen-message { }; |