aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/tools/compression/dtrx/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/compression/dtrx/default.nix')
-rw-r--r--nixpkgs/pkgs/tools/compression/dtrx/default.nix17
1 files changed, 7 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/tools/compression/dtrx/default.nix b/nixpkgs/pkgs/tools/compression/dtrx/default.nix
index edca969a1e8..81a446066d9 100644
--- a/nixpkgs/pkgs/tools/compression/dtrx/default.nix
+++ b/nixpkgs/pkgs/tools/compression/dtrx/default.nix
@@ -1,18 +1,15 @@
{stdenv, lib, fetchurl, pythonPackages
-, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, cabextract, unrar, unshield
+, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield
, bzip2, xz, lzip
-# unsafe:
-# ,p7zip
-# unzip is no longer handled by p7zip, since it's unsafe
-, unzipSupport ? true
+# unzip is handled by p7zip
+, unzipSupport ? false
, unrarSupport ? false }:
let
- # p7zip
- archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip cabextract unshield ]
- ++ lib.optional (unzipSupport) unzip
- ++ lib.optional (unrarSupport) unrar
- ++ [ bzip2 xz lzip ]);
+ archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield ]
+ ++ lib.optional (unzipSupport) unzip
+ ++ lib.optional (unrarSupport) unrar
+ ++ [ bzip2 xz lzip ]);
in pythonPackages.buildPythonApplication rec {
pname = "dtrx";