diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
commit | 215a07c1a9d6d208c1ba0037eccaaba7de9d6b68 (patch) | |
tree | f31e835b16c30957eb4ae3710cbfa922e8a64fbd /pkgs/tools/archivers/unzip | |
parent | b31c67e24d56c90a6732d3a310ff13684b73e200 (diff) | |
parent | 4e3dcd925499547314567107366cae26a99c4ef7 (diff) | |
download | nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.gz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.bz2 nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.lz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.xz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.zst nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.zip |
svn merge ^/nixpkgs/trunk
Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
Diffstat (limited to 'pkgs/tools/archivers/unzip')
-rw-r--r-- | pkgs/tools/archivers/unzip/default.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 7aaa84d9ac9..59ce1e397cf 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.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"; @@ -28,4 +29,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 {})) |