diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2022-12-03 21:25:40 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2022-12-03 21:32:50 +0100 |
| commit | 2d069801fd6191ae97fd0e92c7a696c036b18392 (patch) | |
| tree | 6616ffa34b50c4255549440e07e412760770dd10 /pkgs/tools/misc/android-tools/default.nix | |
| parent | 386563c4ed48bf1b0953c47bc5228db78803edf6 (diff) | |
| download | nixpkgs-2d069801fd6191ae97fd0e92c7a696c036b18392.tar nixpkgs-2d069801fd6191ae97fd0e92c7a696c036b18392.tar.gz nixpkgs-2d069801fd6191ae97fd0e92c7a696c036b18392.tar.bz2 nixpkgs-2d069801fd6191ae97fd0e92c7a696c036b18392.tar.lz nixpkgs-2d069801fd6191ae97fd0e92c7a696c036b18392.tar.xz nixpkgs-2d069801fd6191ae97fd0e92c7a696c036b18392.tar.zst nixpkgs-2d069801fd6191ae97fd0e92c7a696c036b18392.zip | |
android-tools: Avoid installing avbtool twice and update the description
The last release (version 33.0.3p1 [0], added in 28609af5c71) started to include avbtool and mkdtboimg [1]. This is just a minor fixup to update the package description and stop installing avbtool twice: $ sha256sum /nix/store/f2ld3hjbxnafi3jw299nq4mc94xpcmx6-android-tools-33.0.3p1/bin/avbtool* d4357c43798d6aa6d5cea3b8f3ad39e54244a1105db8048dc673c44119835e1c /nix/store/f2ld3hjbxnafi3jw299nq4mc94xpcmx6-android-tools-33.0.3p1/bin/avbtool d4357c43798d6aa6d5cea3b8f3ad39e54244a1105db8048dc673c44119835e1c /nix/store/f2ld3hjbxnafi3jw299nq4mc94xpcmx6-android-tools-33.0.3p1/bin/avbtool.py [0]: https://github.com/nmeum/android-tools/releases/tag/33.0.3p1 [1]: https://github.com/nmeum/android-tools/commit/0652cba5f426591706ffc187e7089943421c38f9
Diffstat (limited to 'pkgs/tools/misc/android-tools/default.nix')
| -rw-r--r-- | pkgs/tools/misc/android-tools/default.nix | 7 |
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 79b1cf7521d..f8ab129f789 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 |