diff options
| author | Bart Brouns <bart@magnetophon.nl> | 2020-06-11 15:17:03 +0200 |
|---|---|---|
| committer | Bart Brouns <bart@magnetophon.nl> | 2020-06-11 18:41:39 +0200 |
| commit | 133e10fb8e5cd1dd0fd7d4a63b87d5f0f2f35544 (patch) | |
| tree | 9f9bda5c71c4f8a81facfe60a5b9221f3de4e484 /pkgs/development | |
| parent | 1683a5f146344d97d738f696997e587452c817a7 (diff) | |
| download | nixpkgs-133e10fb8e5cd1dd0fd7d4a63b87d5f0f2f35544.tar nixpkgs-133e10fb8e5cd1dd0fd7d4a63b87d5f0f2f35544.tar.gz nixpkgs-133e10fb8e5cd1dd0fd7d4a63b87d5f0f2f35544.tar.bz2 nixpkgs-133e10fb8e5cd1dd0fd7d4a63b87d5f0f2f35544.tar.lz nixpkgs-133e10fb8e5cd1dd0fd7d4a63b87d5f0f2f35544.tar.xz nixpkgs-133e10fb8e5cd1dd0fd7d4a63b87d5f0f2f35544.tar.zst nixpkgs-133e10fb8e5cd1dd0fd7d4a63b87d5f0f2f35544.zip | |
Revert "python.pkgs.binwalk: remove p7zip from propagatedBuildInputs"
This reverts commit 9a2ec56ad4587b3aa3777e6fd480980c4d51b292. p7zip is now switched to a maintained fork
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/python-modules/binwalk/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index e8a20b6df47..97c6b957a43 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -7,6 +7,7 @@ , gzip , bzip2 , gnutar +, p7zip , cabextract , lzma , nose @@ -28,7 +29,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar cabextract lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] ++ stdenv.lib.optional visualizationSupport pyqtgraph; # setup.py only installs version.py during install, not test |