diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 63b43b8f0df6..1ccebf4d0e1f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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; md5 = "955c41694772c9fd214e3e206f5d2178"; }; - buildInputs = [pkgconfig fontcacheproto libfontenc fontsproto freetype xproto xtrans ]; - }) // {inherit fontcacheproto libfontenc fontsproto freetype xproto xtrans ;}; + buildInputs = [pkgconfig fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ]; + }) // {inherit fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ;}; libXfontcache = (stdenv.mkDerivation { 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; md5 = "1bcffde85723f78243d1ba60e1ebaef6"; }; - buildInputs = [pkgconfig xextproto xproto ]; - }) // {inherit xextproto xproto ;}; + buildInputs = [pkgconfig xextproto xproto zlib ]; + }) // {inherit xextproto xproto zlib ;}; liboldX = (stdenv.mkDerivation { 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; md5 = "75bbd1dc425849e415a60afd9e74d2ff"; }; - buildInputs = [pkgconfig libfontenc freetype libX11 ]; - }) // {inherit libfontenc freetype libX11 ;}; + buildInputs = [pkgconfig libfontenc freetype libX11 zlib ]; + }) // {inherit libfontenc freetype libX11 zlib ;}; oclock = (stdenv.mkDerivation { name = "oclock-1.0.1"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 039a4cb79f55..eb924cc4be28 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -29,6 +29,7 @@ $pcMap{"libpng12"} = "libpng"; $pcMap{"libdrm"} = "libdrm"; $pcMap{"libdrm"} = "libdrm"; $pcMap{"libXaw"} = "libXaw"; +$pcMap{"zlib"} = "zlib"; $extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; "; @@ -94,6 +95,9 @@ while (<>) { if (/XAW_CHECK_XPRINT_SUPPORT/) { push @requires, "libXaw"; } + if (/zlib is required/) { + push @requires, "zlib"; + } if (/PKG_CHECK_MODULES\([^,]*,\s*\[?([^\),\]]*)/ || /MODULES=\"(.*)\"/ || /REQUIRED_LIBS=\"(.*)\"/ ||