Author: chaoflow
Date: Sat Dec 31 06:07:37 2011
New Revision: 31185
URL: https://nixos.org/websvn/nix/?rev=31185&sc=1
Log:
default.nix now fully generated again
with additional xf86-video-intel-2.17.0 and what looks like a fixed
xf86-video-intel-2.14.901.
Modified:
nixpkgs/trunk/pkgs/servers/x11/xorg/default.nix
Modified: nixpkgs/trunk/pkgs/servers/x11/xorg/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/x11/xorg/default.nix Sat Dec 31 06:07:34
2011 (r31184)
+++ nixpkgs/trunk/pkgs/servers/x11/xorg/default.nix Sat Dec 31 06:07:37
2011 (r31185)
@@ -1577,7 +1577,7 @@
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess
randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto
libXfixes xorgserver xproto libXvMC ];
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto
renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes
xorgserver xproto libXvMC ;};
- xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ?
xf86videointel then overrides.xf86videointel else x: x) {
+ xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ?
xf86videointel_2_14_901 then overrides.xf86videointel_2_14_901 else x: x) {
name = "xf86-video-intel-2.14.901";
builder = ./builder.sh;
src = fetchurl {
@@ -1587,6 +1587,16 @@
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess
randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto
libXfixes xorgserver xproto libXvMC ];
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto
renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes
xorgserver xproto libXvMC ;};
+ xf86videointel_2_17_0 = (stdenv.mkDerivation ((if overrides ?
xf86videointel_2_17_0 then overrides.xf86videointel_2_17_0 else x: x) {
+ name = "xf86-video-intel-2.17.0";
+ builder = ./builder.sh;
+ src = fetchurl {
+ url = mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2;
+ sha256 = "11s3vjp0lrfmb4bv848fd5bajj77j3rf451lm0qyylnclbr5114b";
+ };
+ buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess
pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto
xf86driproto libXfixes xorgserver xproto libXrender libXvMC ];
+ })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman
randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto
libXfixes xorgserver xproto libXrender libXvMC ;};
+
xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then
overrides.xf86videomach64 else x: x) {
name = "xf86-video-mach64-6.8.2";
builder = ./builder.sh;
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
