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

* Added dri2proto to the list of tarballs and reran

Browse source 
the generator.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15201
This commit is contained in:
Eelco Dolstra 2009-04-20 21:59:42 +00:00
parent 089eef511c
commit 0296fabb9e
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,6 +83,16 @@ rec {
buildInputs = [pkgconfig ];
}) // {inherit ;};
dri2proto = (stdenv.mkDerivation {
name = "dri2proto-2.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/proto/dri2proto-2.0.tar.bz2;
sha256 = "1r59dpxinlssq0iangbdxng0cjp88g8nx0w3qh8hdrvzdplsfm0r";
};
buildInputs = [pkgconfig ];
}) // {inherit ;};
encodings = (stdenv.mkDerivation {
name = "encodings-1.0.2";
builder = ./builder.sh;
@ -2084,8 +2094,8 @@ 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 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 ;};
buildInputs = [pkgconfig renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto dri2proto 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];
}) // {inherit renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto dri2proto 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 {
name = "xorg-sgml-doctools-1.2";
@ -2237,14 +2247,4 @@ 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 ;};
}

1
pkgs/servers/x11/xorg/extra.list
View file

@ -3,3 +3,4 @@ http://xcb.freedesktop.org/dist/xcb-util-0.3.4.tar.bz2
http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2
http://xcb.freedesktop.org/dist/libxcb-1.2.tar.bz2
mirror://xorg/individual/lib/pixman-0.15.2.tar.bz2
mirror://xorg/individual/proto/dri2proto-2.0.tar.bz2