JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

diffoscope: use top-level apksigner

Browse Source
This commit is contained in:
Felix C. Stegerman 2021-07-24 22:24:48 +02:00
parent c3778dc4d8
commit 407c9d4437
No known key found for this signature in database
GPG Key ID: B218FF2C27FC6CC6
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/misc/diffoscope/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man, installShellFiles { lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles
, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , 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 , 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 , 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 , 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! # 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 { python3Packages.buildPythonApplication rec {
pname = "diffoscope"; pname = "diffoscope";
version = "178"; version = "178";

1
pkgs/top-level/all-packages.nix
View File

@ -4206,7 +4206,6 @@ in
diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { }; diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { };
diffoscopeMinimal = callPackage ../tools/misc/diffoscope { diffoscopeMinimal = callPackage ../tools/misc/diffoscope {
inherit (androidenv.androidPkgs_9_0) build-tools;
jdk = jdk8; jdk = jdk8;
}; };