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 803832f52d82..8abd813fb8fe 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 884af0f0b035..e3b48f483254 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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
A3jhEB

literal 0
HcmV?d00001

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13995e05e124..ea3be6129105 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 { };