dtrx: remove p7zip, since it's unsafe

This commit is contained in:
Bart Brouns 2020-05-26 16:20:47 +02:00
parent 5f63bf75a3
commit 9b3ca0c614

View File

@ -1,12 +1,15 @@
{stdenv, lib, fetchurl, pythonPackages {stdenv, lib, fetchurl, pythonPackages
, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield , gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, cabextract, unrar, unshield
, bzip2, xz, lzip , bzip2, xz, lzip
# unzip is handled by p7zip # unsafe:
, unzipSupport ? false # ,p7zip
# unzip is no longer handled by p7zip, since it's unsafe
, unzipSupport ? true
, unrarSupport ? false }: , unrarSupport ? false }:
let let
archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield ] # p7zip
archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip cabextract unshield ]
++ lib.optional (unzipSupport) unzip ++ lib.optional (unzipSupport) unzip
++ lib.optional (unrarSupport) unrar ++ lib.optional (unrarSupport) unrar
++ [ bzip2 xz lzip ]); ++ [ bzip2 xz lzip ]);