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

* Some libraries need zlib.

Browse Source 
svn path=/nixpkgs/trunk/; revision=4557
This commit is contained in:
Eelco Dolstra 2006-01-16 12:46:20 +00:00
parent 2939db05c9
commit 830331445d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,8 +812,8 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXfont-X11R7.0-1.0.0.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/libXfont-X11R7.0-1.0.0.tar.bz2;
md5 = "955c41694772c9fd214e3e206f5d2178"; md5 = "955c41694772c9fd214e3e206f5d2178";
}; };
buildInputs = [pkgconfig fontcacheproto libfontenc fontsproto freetype xproto xtrans ]; buildInputs = [pkgconfig fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ];
}) // {inherit fontcacheproto libfontenc fontsproto freetype xproto xtrans ;}; }) // {inherit fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ;};
libXfontcache = (stdenv.mkDerivation { libXfontcache = (stdenv.mkDerivation {
name = "libXfontcache-1.0.1"; name = "libXfontcache-1.0.1";
@ -1032,8 +1032,8 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/liblbxutil-X11R7.0-1.0.0.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/liblbxutil-X11R7.0-1.0.0.tar.bz2;
md5 = "1bcffde85723f78243d1ba60e1ebaef6"; md5 = "1bcffde85723f78243d1ba60e1ebaef6";
}; };
buildInputs = [pkgconfig xextproto xproto ]; buildInputs = [pkgconfig xextproto xproto zlib ];
}) // {inherit xextproto xproto ;}; }) // {inherit xextproto xproto zlib ;};
liboldX = (stdenv.mkDerivation { liboldX = (stdenv.mkDerivation {
name = "liboldX-1.0.1"; name = "liboldX-1.0.1";
@ -1132,8 +1132,8 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/mkfontscale-X11R7.0-1.0.1.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/mkfontscale-X11R7.0-1.0.1.tar.bz2;
md5 = "75bbd1dc425849e415a60afd9e74d2ff"; md5 = "75bbd1dc425849e415a60afd9e74d2ff";
}; };
buildInputs = [pkgconfig libfontenc freetype libX11 ]; buildInputs = [pkgconfig libfontenc freetype libX11 zlib ];
}) // {inherit libfontenc freetype libX11 ;}; }) // {inherit libfontenc freetype libX11 zlib ;};
oclock = (stdenv.mkDerivation { oclock = (stdenv.mkDerivation {
name = "oclock-1.0.1"; name = "oclock-1.0.1";

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

@ -29,6 +29,7 @@ $pcMap{"libpng12"} = "libpng";
$pcMap{"libdrm"} = "libdrm"; $pcMap{"libdrm"} = "libdrm";
$pcMap{"libdrm"} = "libdrm"; $pcMap{"libdrm"} = "libdrm";
$pcMap{"libXaw"} = "libXaw"; $pcMap{"libXaw"} = "libXaw";
$pcMap{"zlib"} = "zlib";
$extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; "; $extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; ";
@ -94,6 +95,9 @@ while (<>) {
if (/XAW_CHECK_XPRINT_SUPPORT/) { if (/XAW_CHECK_XPRINT_SUPPORT/) {
push @requires, "libXaw"; push @requires, "libXaw";
} }
if (/zlib is required/) {
push @requires, "zlib";
}
if (/PKG_CHECK_MODULES\([^,]*,\s*\[?([^\),\]]*)/ || if (/PKG_CHECK_MODULES\([^,]*,\s*\[?([^\),\]]*)/ ||
/MODULES=\"(.*)\"/ || /MODULES=\"(.*)\"/ ||
/REQUIRED_LIBS=\"(.*)\"/ || /REQUIRED_LIBS=\"(.*)\"/ ||