diff options
| author | Felix C. Stegerman <flx@obfusk.net> | 2021-07-24 22:24:48 +0200 |
|---|---|---|
| committer | Felix C. Stegerman <flx@obfusk.net> | 2021-07-24 22:24:48 +0200 |
| commit | 407c9d4437751a0f4c74235da4d331dac66d1ecd (patch) | |
| tree | 79f816aa0dbb5085d5e52940932b1401c0d2f285 /pkgs/tools/misc/diffoscope/default.nix | |
| parent | c3778dc4d8285b3f01e9efd0a2f5ead6c699a3da (diff) | |
| download | nixpkgs-407c9d4437751a0f4c74235da4d331dac66d1ecd.tar nixpkgs-407c9d4437751a0f4c74235da4d331dac66d1ecd.tar.gz nixpkgs-407c9d4437751a0f4c74235da4d331dac66d1ecd.tar.bz2 nixpkgs-407c9d4437751a0f4c74235da4d331dac66d1ecd.tar.lz nixpkgs-407c9d4437751a0f4c74235da4d331dac66d1ecd.tar.xz nixpkgs-407c9d4437751a0f4c74235da4d331dac66d1ecd.tar.zst nixpkgs-407c9d4437751a0f4c74235da4d331dac66d1ecd.zip | |
diffoscope: use top-level apksigner
Diffstat (limited to 'pkgs/tools/misc/diffoscope/default.nix')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 88a9846e835..629c8accfb9 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man, installShellFiles -, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc +{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles +, abootimg, acl, apksigner, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R , radare2, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd @@ -7,13 +7,6 @@ }: # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! -let - apksigner = runCommand "apksigner" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin - makeWrapper "${jdk}/bin/java" "$out/bin/apksigner" \ - --add-flags "-jar ${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3/lib/apksigner.jar" - ''; -in python3Packages.buildPythonApplication rec { pname = "diffoscope"; version = "178"; |