swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 13:29:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

diffoscope: Add more tools to the runtime path

Browse source
This commit is contained in:
Tuomas Tynkkynen 2015-12-23 23:40:59 +02:00
parent 7e85fdc6df
commit eae60d2f40
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/misc/diffoscope/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, pythonPackages, docutils { stdenv, fetchgit, pythonPackages, docutils
, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext , acl, binutils, bzip2, cbfstool, cdrkit, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc, gnupg1
, gnupg, gzip, pdftk, poppler_utils, rpm, sqlite, squashfsTools, unzip, vim, xz , gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz
}: }:
pythonPackages.buildPythonPackage rec { pythonPackages.buildPythonPackage rec {
@ -20,11 +20,11 @@ pythonPackages.buildPythonPackage rec {
sed -i setup.py -e "/'rpm-python',/d" sed -i setup.py -e "/'rpm-python',/d"
''; '';
# Still missing these tools: enjarify ghc img2txt javap otool(maybe OS X only) ppudump showttf sng # Still missing these tools: enjarify otool(maybe OS X only) showttf
# Also these libraries: python3-guestfs # Also these libraries: python3-guestfs
propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++ propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
[ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file fpc gettext ghc gnupg1
gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ]; gzip jdk libcaca mono pdftk poppler_utils rpm sng sqlite squashfsTools unzip vim xz ];
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root doCheck = false; # Calls 'mknod' in squashfs tests, which needs root

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

@ -1286,6 +1286,7 @@ let
di = callPackage ../tools/system/di { }; di = callPackage ../tools/system/di { };
diffoscope = callPackage ../tools/misc/diffoscope { diffoscope = callPackage ../tools/misc/diffoscope {
jdk = jdk7;
pythonPackages = python3Packages; pythonPackages = python3Packages;
rpm = rpm.override { python = python3; }; rpm = rpm.override { python = python3; };
}; };