Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Fix for zlib on Darwin (it always wants to install in /usr/lib,

Browse Source 
despite the prefix).
* Indirections in all-packages-generic for patch.
* Darwin: removed version number.

svn path=/nixpkgs/trunk/; revision=1247
This commit is contained in:
Eelco Dolstra
2004-08-09 14:33:14 +00:00
parent 7474f5713f
commit 128a5bd522
9 changed files with 103 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/zlib-mac-fix/darwin.patch Normal file
View File

@@ -0,0 +1,22 @@
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

12
pkgs/development/libraries/zlib-mac-fix/default.nix Normal file
View File

@@ -0,0 +1,12 @@
{stdenv, fetchurl, patch}:
stdenv.mkDerivation {
name = "zlib-1.2.1";
src = fetchurl {
url = http://www.gzip.org/zlib/zlib-1.2.1.tar.gz;
md5 = "ef1cb003448b4a53517b8f25adb12452";
};
configureFlags = "--shared";
patches = [./darwin.patch];
buildInputs = [patch];
}