The unzip Nixpkgs expression does not build with the NLS attribute
selected because the patch conditionally applied conflicts with the
earlier patch [dont-hardcode-cc.patch].
The attached patch fixes the build by increasing the patch fuzz to the
size of the context.
>From 67ebd468d2780affe665308151607d00a3766d50 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkal...@skami.org>
Date: Sat, 8 Jul 2017 21:58:43 -0400
Subject: [PATCH] unzipNLS : Fix build by removing patch fuzz.
---
pkgs/tools/archivers/unzip/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index 896cdd5097..a35e473ec3 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
+ patchFlags = "-p1 -F3";
+
patches = [
./CVE-2014-8139.diff
./CVE-2014-8140.diff
--
2.13.2
_______________________________________________
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev
