diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-27 00:07:07 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-27 00:07:07 +0000 |
| commit | f6b15579b88771aea8d8189f688f7d3572241a93 (patch) | |
| tree | 4701b1ccd930ddfab82ee51a7250b7e673680d69 | |
| parent | 8db3dbaf1ac66820285024930bef482194e206a5 (diff) | |
| download | nixlib-f6b15579b88771aea8d8189f688f7d3572241a93.tar nixlib-f6b15579b88771aea8d8189f688f7d3572241a93.tar.gz nixlib-f6b15579b88771aea8d8189f688f7d3572241a93.tar.bz2 nixlib-f6b15579b88771aea8d8189f688f7d3572241a93.tar.lz nixlib-f6b15579b88771aea8d8189f688f7d3572241a93.tar.xz nixlib-f6b15579b88771aea8d8189f688f7d3572241a93.tar.zst nixlib-f6b15579b88771aea8d8189f688f7d3572241a93.zip | |
svn path=/nixpkgs/trunk/; revision=8065
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 90f6a1e76739..80931db32046 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2662,8 +2662,7 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xorg-server-X11R7.2-1.2.0.tar.bz2; sha256 = "023a13aay8gd09a7x1s6wndbsj3xr2ismsvgbsi9dz4g7nw8ga96"; }; - patches = [./xorgserver-dri-path.patch]; - buildInputs = [pkgconfig bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto renderproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ]; mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; + buildInputs = [pkgconfig bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto renderproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ]; mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch]; }) // {inherit bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto renderproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ;}; xorgsgmldoctools = (stdenv.mkDerivation { |