summary refs log tree commit diff
path: root/pkgs/tools/misc/diffoscope
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2016-12-01 16:39:51 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2016-12-01 21:07:33 +0100
commit19ca20c91f56b47b194039781145f0cba9a2ddc3 (patch)
treefa57363babe5759c931bed48bbde5c2ea3f9850f /pkgs/tools/misc/diffoscope
parent74276caf194ac9a1398cf164ec6604c3730f75a2 (diff)
downloadnixlib-19ca20c91f56b47b194039781145f0cba9a2ddc3.tar
nixlib-19ca20c91f56b47b194039781145f0cba9a2ddc3.tar.gz
nixlib-19ca20c91f56b47b194039781145f0cba9a2ddc3.tar.bz2
nixlib-19ca20c91f56b47b194039781145f0cba9a2ddc3.tar.lz
nixlib-19ca20c91f56b47b194039781145f0cba9a2ddc3.tar.xz
nixlib-19ca20c91f56b47b194039781145f0cba9a2ddc3.tar.zst
nixlib-19ca20c91f56b47b194039781145f0cba9a2ddc3.zip
pythonPackages.rpm: rpm for specific python version
rpm provides a Python module that is used by certain packages. We need
to override pkgs.rpm to get a correct version.
Diffstat (limited to 'pkgs/tools/misc/diffoscope')
-rw-r--r--pkgs/tools/misc/diffoscope/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 4d5eabfebc90..c6eb7c8b0180 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils
 , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc
-, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz
+, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz
 , enableBloat ? false
 }:
 
@@ -29,9 +29,9 @@ pythonPackages.buildPythonApplication rec {
   # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
   # Also these libraries: python3-guestfs
   # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
-  propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
+  propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh rpm ]) ++
     map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
-      gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz
+      gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz
     ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root