diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-17 17:02:18 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-17 17:02:18 +0000 |
| commit | d575666a1208c5b4b0fd852b48198bfb01012ad8 (patch) | |
| tree | 3322d50d1fcfd0fb7e150a7bdd2bc700749eb778 /pkgs/development/libraries/zlib | |
| parent | 31ebc5d950e4d7afd9ba384459e749911f6878ef (diff) | |
* Fix building zlib on Cygwin.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32358
Diffstat (limited to 'pkgs/development/libraries/zlib')
| -rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/zlib/no-shared.patch | 14 |
2 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 1776e1349e6d3..7517b2e498acf 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -4,12 +4,14 @@ stdenv.mkDerivation rec { name = "zlib-1.2.6"; src = fetchurl { - urls = [ "http://www.zlib.net/${name}.tar.gz" - "http://gentoo.netnitco.net/distfiles/${name}.tar.gz" ]; + urls = + [ "http://www.zlib.net/${name}.tar.gz" + "http://gentoo.netnitco.net/distfiles/${name}.tar.gz" + ]; sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1"; }; - patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") [ ./no-shared.patch ]; + patches = [ ]; configureFlags = if static then "" else "--shared"; diff --git a/pkgs/development/libraries/zlib/no-shared.patch b/pkgs/development/libraries/zlib/no-shared.patch deleted file mode 100644 index e26449ffd9f06..0000000000000 --- a/pkgs/development/libraries/zlib/no-shared.patch +++ /dev/null @@ -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 \ |