alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fixing mesa and xorgserver

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15199
This commit is contained in:
Lluís Batlle i Rossell 2009-04-20 18:46:32 +00:00
parent 2eb865a98f
commit 15f1feb702
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/mesa/default.nix
View file

@ -19,7 +19,7 @@ stdenv.mkDerivation {
buildInputs = [
pkgconfig expat x11 libdrm xlibs.glproto
xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage
xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
];
passthru = {inherit libdrm;};

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

@ -2084,7 +2084,7 @@ rec {
url = mirror://xorg/individual/xserver/xorg-server-1.5.3.tar.bz2;
sha256 = "1fymhb0v83hmbka1sdg9z2vfkjagskawaxajks0n6xxyai7ig056";
};
buildInputs = [pkgconfig renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ]; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ]; propagatedBuildInputs = [libpciaccess];
buildInputs = [pkgconfig renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib dri2proto ]; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ]; propagatedBuildInputs = [libpciaccess];
}) // {inherit renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm zlib ;};
xorgsgmldoctools = (stdenv.mkDerivation {
@ -2236,5 +2236,15 @@ rec {
};
buildInputs = [pkgconfig libX11 ];
}) // {inherit libX11 ;};
dri2proto = (stdenv.mkDerivation {
name = "dri2proto-1.99.3";
builder = ./builder.sh;
src = fetchurl {
url = http://xorg.freedesktop.org/releases/individual/proto/dri2proto-1.99.3.tar.bz2;
sha256 = "053rrg8k4fs6rk82b7npc9wbj9591ir4gnlzjpwwciqmzhkxaj7f";
};
buildInputs = [pkgconfig ];
}) // {inherit ;};
}