diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-26 23:10:25 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-26 23:10:25 +0000 |
commit | ba443448e80314d16a5eb843313e8c103ed33150 (patch) | |
tree | 6b02ceb8328b3e2101422d248ab451ad416a766e /pkgs/servers/x11/xorg | |
parent | 7edbaaaff2e0454a372be0482167f6377acfbb15 (diff) | |
download | nixpkgs-ba443448e80314d16a5eb843313e8c103ed33150.tar nixpkgs-ba443448e80314d16a5eb843313e8c103ed33150.tar.gz nixpkgs-ba443448e80314d16a5eb843313e8c103ed33150.tar.bz2 nixpkgs-ba443448e80314d16a5eb843313e8c103ed33150.tar.lz nixpkgs-ba443448e80314d16a5eb843313e8c103ed33150.tar.xz nixpkgs-ba443448e80314d16a5eb843313e8c103ed33150.tar.zst nixpkgs-ba443448e80314d16a5eb843313e8c103ed33150.zip |
* Build the i810 driver. Only depend on the Mesa headers, not all of Mesa.
svn path=/nixpkgs/trunk/; revision=8060
Diffstat (limited to 'pkgs/servers/x11/xorg')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 10 | ||||
-rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 6 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 73d27283c30..c8108fbcd12 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,6 +1,6 @@ # This is a generated file. Do not edit! { stdenv, fetchurl, pkgconfig, freetype, fontconfig -, libxslt, expat, libdrm, libpng, zlib, perl, mesa +, libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders }: rec { @@ -2046,13 +2046,13 @@ rec { }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoi810 = (stdenv.mkDerivation { - name = "xf86-video-i810-1.6.5"; + name = "xf86-video-i810-1.7.4"; builder = ./builder.sh; src = fetchurl { - url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-i810-X11R7.2-1.6.5.tar.bz2; - sha256 = "04f65vcgzjxi7sl7ps9xs8i481q2kj7fj4q2n5cgwlaayamgnlf4"; + url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2; + sha256 = "0na2qy78waa9jy0ikd10g805v0w048icnkdcss6yd753kffdi37z"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ]; + buildInputs = [pkgconfig fontsproto glproto libdrm randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC mesaHeaders ]; }) // {inherit fontsproto glproto libdrm randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;}; xf86videoimstt = (stdenv.mkDerivation { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9e551ffd02c..9dbc44bea3a 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -33,6 +33,7 @@ $pcMap{"libXaw"} = "libXaw"; $pcMap{"zlib"} = "zlib"; $pcMap{"perl"} = "perl"; $pcMap{"mesa"} = "mesa"; +$pcMap{"mesaHeaders"} = "mesaHeaders"; $pcMap{"mkfontscale"} = "mkfontscale"; $pcMap{"mkfontdir"} = "mkfontdir"; $pcMap{"bdftopcf"} = "bdftopcf"; @@ -178,7 +179,7 @@ while (<>) { process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g; #push @requires, "mesa" if $pkg =~ /xorgserver/ or $pkg =~ /xf86videoi810/; - push @requires, "glproto" if $pkg =~ /xf86videoi810/; + push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videoi810/; push @requires, "zlib" if $pkg =~ /xorgserver/; push @requires, "libxslt" if $pkg =~ /libxcb/; @@ -197,7 +198,7 @@ print OUT ""; print OUT <<EOF; # This is a generated file. Do not edit! { stdenv, fetchurl, pkgconfig, freetype, fontconfig -, libxslt, expat, libdrm, libpng, zlib, perl, mesa +, libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders }: rec { @@ -241,3 +242,4 @@ EOF print OUT "}\n"; close OUT; +> diff --git a/pkgs/servers/x11/xorg/tarballs b/pkgs/servers/x11/xorg/tarballs index 190655239cf..d4c34d12b3e 100644 --- a/pkgs/servers/x11/xorg/tarballs +++ b/pkgs/servers/x11/xorg/tarballs @@ -192,7 +192,6 @@ http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-fbd http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-glint-X11R7.1-1.1.1.tar.bz2 http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-i128-X11R7.2-1.2.1.tar.bz2 http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-i740-X11R7.1-1.1.0.tar.bz2 -http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-i810-X11R7.2-1.6.5.tar.bz2 http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-imstt-X11R7.1-1.1.0.tar.bz2 http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-mga-X11R7.2-1.4.6.1.tar.bz2 http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2 @@ -289,3 +288,4 @@ http://xcb.freedesktop.org/dist/libxcb-1.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.1.tar.bz2 http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2 +http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2 |