diff options
Diffstat (limited to 'pkgs/tools/archivers/p7zip/default.nix')
| -rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 4d8b2477ed58..4886217211df 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "p7zip-${version}"; @@ -10,16 +10,8 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch rec { - name = "CVE-2016-9296.patch"; - url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/12-${name}"; - sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m"; - }) - (fetchpatch rec { - name = "CVE-2017-17969.patch"; - url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/13-${name}"; - sha256 = "00pycdwx6gw7w591bg54ym6zhbxgn47p3zhms6mnmaycfzw09mkn"; - }) + ./12-CVE-2016-9296.patch + ./13-CVE-2017-17969.patch ]; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional |