public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix building zlib on Cygwin.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32358
This commit is contained in:
Eelco Dolstra 2012-02-17 17:02:18 +00:00
parent 31ebc5d950
commit d575666a12
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/zlib/default.nix
View File

@ -4,12 +4,14 @@ stdenv.mkDerivation rec {
name = "zlib-1.2.6"; name = "zlib-1.2.6";
src = fetchurl { src = fetchurl {
urls = [ "http://www.zlib.net/${name}.tar.gz" urls =
"http://gentoo.netnitco.net/distfiles/${name}.tar.gz" ]; [ "http://www.zlib.net/${name}.tar.gz"
"http://gentoo.netnitco.net/distfiles/${name}.tar.gz"
];
sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1"; sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1";
}; };
patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") [ ./no-shared.patch ]; patches = [ ];
configureFlags = if static then "" else "--shared"; configureFlags = if static then "" else "--shared";

14
pkgs/development/libraries/zlib/no-shared.patch
View File

@ -1,14 +0,0 @@
Support building the static library only.
diff -ru -x '*~' zlib-1.2.5-orig/Makefile.in zlib-1.2.5/Makefile.in
--- zlib-1.2.5-orig/Makefile.in 2010-04-20 06:12:21.000000000 +0200
+++ zlib-1.2.5/Makefile.in 2010-07-27 13:25:02.176322291 +0200
@@ -168,7 +168,7 @@
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
cp $(STATICLIB) $(DESTDIR)$(libdir)
- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+ test -z "$(SHAREDLIBV)" || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \