From 75262bcbed4fb93daeaefc2610e0ab3493b587fc Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 1 Feb 2012 22:32:16 +0000
Subject: [PATCH] zip, unzip: add NLS support

svn path=/nixpkgs/trunk/; revision=31961
---
 pkgs/tools/archivers/unzip/6.0.nix            |  20 +++++++++++++-----
 pkgs/tools/archivers/zip/default.nix          |   8 ++++++-
 .../archivers/zip/natspec-gentoo.patch.bz2    | Bin 0 -> 1914 bytes
 pkgs/top-level/all-packages.nix               |   2 ++
 4 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2

diff --git a/pkgs/tools/archivers/unzip/6.0.nix b/pkgs/tools/archivers/unzip/6.0.nix
index 803832f52d8..8abd813fb8f 100644
--- a/pkgs/tools/archivers/unzip/6.0.nix
+++ b/pkgs/tools/archivers/unzip/6.0.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, bzip2 }:
+{ stdenv, fetchurl, bzip2
+, enableNLS ? false, libnatspec }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation ({
   name = "unzip-6.0";
   
   src = fetchurl {
@@ -8,11 +9,11 @@ stdenv.mkDerivation {
     sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83";
   };
 
-  buildInputs = [ bzip2 ];
+  buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec;
 
   makefile = "unix/Makefile";
 
-  NIX_LDFLAGS = "-lbz2";
+  NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec";
 
   buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2";
 
@@ -24,4 +25,13 @@ stdenv.mkDerivation {
     license = "free"; # http://www.info-zip.org/license.html
     meta.platforms = stdenv.lib.platforms.all;
   };
-}
+} // (if enableNLS then {
+  patches =
+    [ ( fetchurl {
+        url =
+        "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";
+        name = "unzip-6.0-natspec.patch";
+        sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1";
+      })
+    ];
+} else {}))
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 884af0f0b03..e3b48f48325 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, libnatspec }:
 
 stdenv.mkDerivation {
   name = "zip-3.0";
@@ -12,8 +12,14 @@ stdenv.mkDerivation {
 
   installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp";
 
+  patches = [ ./natspec-gentoo.patch.bz2 ];
+
+  buildInputs = [ libnatspec ];
+
   meta = {
     homepage = http://www.info-zip.org;
+    platforms = stdenv.lib.platforms.all;
+    maintainer = [ stdenv.lib.maintainers.urkud ];
   };
 }
 
diff --git a/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2 b/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..816f32aba3c3d835f8a67440a7088c781fedffbd
GIT binary patch
literal 1914
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

literal 0
HcmV?d00001

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13995e05e12..ea3be612910 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1535,6 +1535,8 @@ let
 
   unzip = unzip60;
 
+  unzipNLS = unzip.override { enableNLS = true; };
+
   unzip552 = callPackage ../tools/archivers/unzip/5.52.nix { };
 
   unzip60 = callPackage ../tools/archivers/unzip/6.0.nix { };