about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2022-12-04 17:34:08 +0100
committerGitHub <noreply@github.com>2022-12-04 17:34:08 +0100
commit6df43625eada2cb38ccfccc079f36194f79ebf19 (patch)
tree5137dca92060e01f9fe78bd2da1edd69f3ff3565 /pkgs/tools
parent331d854662518444611d144a43495636c175b06f (diff)
parent2d069801fd6191ae97fd0e92c7a696c036b18392 (diff)
Merge pull request #204348 from primeos/android-tools
android-tools: Avoid installing avbtool twice and update the description
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/android-tools/default.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix
index 79b1cf7521db7..f8ab129f789b2 100644
--- a/pkgs/tools/misc/android-tools/default.nix
+++ b/pkgs/tools/misc/android-tools/default.nix
@@ -35,10 +35,6 @@ stdenv.mkDerivation rec {
     export GOCACHE=$TMPDIR/go-cache
   '';
 
-  postInstall = ''
-    install -Dm755 ../vendor/avb/avbtool.py -t $out/bin
-  '';
-
   meta = with lib; {
     description = "Android SDK platform tools";
     longDescription = ''
@@ -53,7 +49,8 @@ stdenv.mkDerivation rec {
       - mke2fs.android (required by fastboot)
       - simg2img, img2simg, append2simg
       - lpdump, lpmake, lpadd, lpflash, lpunpack
-      - mkbootimg, unpack_bootimg, repack_bootimg
+      - mkbootimg, unpack_bootimg, repack_bootimg, avbtool
+      - mkdtboimg
     '';
     # https://developer.android.com/studio/command-line#tools-platform
     # https://developer.android.com/studio/releases/platform-tools