* Zlib updated to 1.2.2.
svn path=/nixpkgs/trunk/; revision=2517
This commit is contained in:
parent
fc20bd6518
commit
67140c410f
@ -1,22 +0,0 @@
|
|||||||
diff -rc zlib-1.2.1/configure zlib-patched/configure
|
|
||||||
*** zlib-1.2.1/configure 2003-11-17 04:50:39.000000000 +0100
|
|
||||||
--- zlib-patched/configure 2004-08-05 19:18:59.000000000 +0200
|
|
||||||
***************
|
|
||||||
*** 89,97 ****
|
|
||||||
SHAREDLIB=libz$shared_ext
|
|
||||||
SHAREDLIBV=libz.$VER$shared_ext
|
|
||||||
SHAREDLIBM=libz.$VER1$shared_ext
|
|
||||||
! LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name /usr/lib/$SHAREDLIBV -compatibility_version $VER2 -current_version $VER"}
|
|
||||||
! libdir='/usr/lib'
|
|
||||||
! includedir='/usr/include';;
|
|
||||||
*) LDSHARED=${LDSHARED-"$cc -shared"};;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
--- 89,95 ----
|
|
||||||
SHAREDLIB=libz$shared_ext
|
|
||||||
SHAREDLIBV=libz.$VER$shared_ext
|
|
||||||
SHAREDLIBM=libz.$VER1$shared_ext
|
|
||||||
! LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name \${libdir}/$SHAREDLIBV -compatibility_version $VER2 -current_version $VER"};;
|
|
||||||
*) LDSHARED=${LDSHARED-"$cc -shared"};;
|
|
||||||
esac
|
|
||||||
else
|
|
@ -1,11 +1,10 @@
|
|||||||
{stdenv, fetchurl}:
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "zlib-1.2.1";
|
name = "zlib-1.2.2";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zlib-1.2.1.tar.gz;
|
url = http://www.gzip.org/zlib/zlib-1.2.2.tar.gz;
|
||||||
md5 = "ef1cb003448b4a53517b8f25adb12452";
|
md5 = "68bd51aaa6558c3bc3fd4890e53413de";
|
||||||
};
|
};
|
||||||
configureFlags = "--shared";
|
configureFlags = "--shared";
|
||||||
patches = [./darwin.patch];
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user