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

* Even more zlib dependencies.

Browse Source 
svn path=/nixpkgs/trunk/; revision=4558
This commit is contained in:
Eelco Dolstra 2006-01-16 12:59:09 +00:00
parent 830331445d
commit b243aa0f12
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/servers/x11/xorg/default.nix
View File

@ -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; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/lbxproxy-X11R7.0-1.0.1.tar.bz2;
md5 = "d9c05283660eae742a77dcbc0091841a"; md5 = "d9c05283660eae742a77dcbc0091841a";
}; };
buildInputs = [pkgconfig 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 ;}; }) // {inherit bigreqsproto libICE liblbxutil libX11 libXext xproxymanagementprotocol xtrans zlib ;};
libAppleWM = (stdenv.mkDerivation { libAppleWM = (stdenv.mkDerivation {
name = "libAppleWM-1.0.0"; 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; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libfontenc-X11R7.0-1.0.1.tar.bz2;
md5 = "d7971cbb2d1000737bba86a4bd70b900"; md5 = "d7971cbb2d1000737bba86a4bd70b900";
}; };
buildInputs = [pkgconfig xproto ]; buildInputs = [pkgconfig xproto zlib ];
}) // {inherit xproto ;}; }) // {inherit xproto zlib ;};
liblbxutil = (stdenv.mkDerivation { liblbxutil = (stdenv.mkDerivation {
name = "liblbxutil-1.0.0"; 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; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/luit-X11R7.0-1.0.1.tar.bz2;
md5 = "30428b8ff783a0cfd61dab05a17cfaa7"; md5 = "30428b8ff783a0cfd61dab05a17cfaa7";
}; };
buildInputs = [pkgconfig libfontenc libX11 ]; buildInputs = [pkgconfig libfontenc libX11 zlib ];
}) // {inherit libfontenc libX11 ;}; }) // {inherit libfontenc libX11 zlib ;};
makedepend = (stdenv.mkDerivation { makedepend = (stdenv.mkDerivation {
name = "makedepend-1.0.0"; name = "makedepend-1.0.0";

2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -95,7 +95,7 @@ while (<>) {
if (/XAW_CHECK_XPRINT_SUPPORT/) { if (/XAW_CHECK_XPRINT_SUPPORT/) {
push @requires, "libXaw"; push @requires, "libXaw";
} }
if (/zlib is required/) { if (/zlib is required/ || /AC_CHECK_LIB\(z\,/) {
push @requires, "zlib"; push @requires, "zlib";
} }
if (/PKG_CHECK_MODULES\([^,]*,\s*\[?([^\),\]]*)/ || if (/PKG_CHECK_MODULES\([^,]*,\s*\[?([^\),\]]*)/ ||