From b243aa0f12fd149d20d21c82e2e7a9bdb1ec3c98 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Jan 2006 12:59:09 +0000
Subject: [PATCH] * Even more zlib dependencies.

svn path=/nixpkgs/trunk/; revision=4558
---
 pkgs/servers/x11/xorg/default.nix                    | 12 ++++++------
 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1ccebf4d0e1f..d5ce38065284 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -632,8 +632,8 @@ rec {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/lbxproxy-X11R7.0-1.0.1.tar.bz2;
       md5 = "d9c05283660eae742a77dcbc0091841a";
     };
-    buildInputs = [pkgconfig bigreqsproto libICE liblbxutil libX11 libXext xproxymanagementprotocol xtrans ];
-  }) // {inherit bigreqsproto libICE liblbxutil libX11 libXext xproxymanagementprotocol xtrans ;};
+    buildInputs = [pkgconfig bigreqsproto libICE liblbxutil libX11 libXext xproxymanagementprotocol xtrans zlib ];
+  }) // {inherit bigreqsproto libICE liblbxutil libX11 libXext xproxymanagementprotocol xtrans zlib ;};
     
   libAppleWM = (stdenv.mkDerivation {
     name = "libAppleWM-1.0.0";
@@ -1022,8 +1022,8 @@ rec {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libfontenc-X11R7.0-1.0.1.tar.bz2;
       md5 = "d7971cbb2d1000737bba86a4bd70b900";
     };
-    buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+    buildInputs = [pkgconfig xproto zlib ];
+  }) // {inherit xproto zlib ;};
     
   liblbxutil = (stdenv.mkDerivation {
     name = "liblbxutil-1.0.0";
@@ -1092,8 +1092,8 @@ rec {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/luit-X11R7.0-1.0.1.tar.bz2;
       md5 = "30428b8ff783a0cfd61dab05a17cfaa7";
     };
-    buildInputs = [pkgconfig libfontenc libX11 ];
-  }) // {inherit libfontenc libX11 ;};
+    buildInputs = [pkgconfig libfontenc libX11 zlib ];
+  }) // {inherit libfontenc libX11 zlib ;};
     
   makedepend = (stdenv.mkDerivation {
     name = "makedepend-1.0.0";
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index eb924cc4be28..9c3044d5ab47 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -95,7 +95,7 @@ while (<>) {
         if (/XAW_CHECK_XPRINT_SUPPORT/) {
             push @requires, "libXaw";
         }
-        if (/zlib is required/) {
+        if (/zlib is required/ || /AC_CHECK_LIB\(z\,/) {
             push @requires, "zlib";
         }
         if (/PKG_CHECK_MODULES\([^,]*,\s*\[?([^\),\]]*)/ ||