diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-03-18 02:21:10 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-04-19 03:58:40 +0200 |
| commit | 33acfbe9176cd0b88d3cb821a749de757e19ce58 (patch) | |
| tree | 537f002d2d068b96575498e92da22679c2003482 /pkgs/development | |
| parent | 5b67290740fbb0d8b9a5bcc0d9a9108b844add5d (diff) | |
| download | nixpkgs-33acfbe9176cd0b88d3cb821a749de757e19ce58.tar nixpkgs-33acfbe9176cd0b88d3cb821a749de757e19ce58.tar.gz nixpkgs-33acfbe9176cd0b88d3cb821a749de757e19ce58.tar.bz2 nixpkgs-33acfbe9176cd0b88d3cb821a749de757e19ce58.tar.lz nixpkgs-33acfbe9176cd0b88d3cb821a749de757e19ce58.tar.xz nixpkgs-33acfbe9176cd0b88d3cb821a749de757e19ce58.tar.zst nixpkgs-33acfbe9176cd0b88d3cb821a749de757e19ce58.zip | |
minizip: New package based on zlib derivation.
This is needed by Chromium and is part of the zlib source tree in contrib/, so let's propagate the version of zlib and use the same source tree. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/minizip/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix new file mode 100644 index 00000000000..b71920446e4 --- /dev/null +++ b/pkgs/development/libraries/minizip/default.nix @@ -0,0 +1,14 @@ +{ stdenv, zlib, autoconf, automake, libtool }: + +stdenv.mkDerivation { + name = "minizip-${zlib.version}"; + inherit (zlib) src; + + nativeBuildInputs = [ autoconf automake libtool ]; + buildInputs = [ zlib ]; + + preConfigure = '' + cd contrib/minizip + autoreconf -vfi + ''; +} diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 0d4abaf25e0..f1eea80ab7a 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -40,4 +40,6 @@ stdenv.mkDerivation rec { # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv. cygwinConfigureEnableShared = true; + + passthru.version = version; } |