public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Build the i810 driver. Only depend on the Mesa headers, not all of Mesa.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8060
This commit is contained in:
Eelco Dolstra 2007-02-26 23:10:25 +00:00
parent 7edbaaaff2
commit ba443448e8
5 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/mesa/headers.nix Normal file
View File

@ -0,0 +1,10 @@
{stdenv, mesaSrc}:
stdenv.mkDerivation {
name = "mesa-headers-6.5.2"; # !!! keep up-to-date
buildCommand = "
unpackFile ${mesaSrc}
ensureDir $out/include
cp -prvd Mesa-*/include/GL $out/include/
";
}

10
pkgs/servers/x11/xorg/default.nix
View File

@ -1,6 +1,6 @@
# This is a generated file. Do not edit! # This is a generated file. Do not edit!
{ stdenv, fetchurl, pkgconfig, freetype, fontconfig { stdenv, fetchurl, pkgconfig, freetype, fontconfig
, libxslt, expat, libdrm, libpng, zlib, perl, mesa , libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders
}: }:
rec { rec {
@ -2046,13 +2046,13 @@ rec {
}) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;}; }) // {inherit fontsproto randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoi810 = (stdenv.mkDerivation { xf86videoi810 = (stdenv.mkDerivation {
name = "xf86-video-i810-1.6.5"; name = "xf86-video-i810-1.7.4";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { 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; url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2;
sha256 = "04f65vcgzjxi7sl7ps9xs8i481q2kj7fj4q2n5cgwlaayamgnlf4"; 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 ;}; }) // {inherit fontsproto glproto libdrm randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;};
xf86videoimstt = (stdenv.mkDerivation { xf86videoimstt = (stdenv.mkDerivation {

6
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -33,6 +33,7 @@ $pcMap{"libXaw"} = "libXaw";
$pcMap{"zlib"} = "zlib"; $pcMap{"zlib"} = "zlib";
$pcMap{"perl"} = "perl"; $pcMap{"perl"} = "perl";
$pcMap{"mesa"} = "mesa"; $pcMap{"mesa"} = "mesa";
$pcMap{"mesaHeaders"} = "mesaHeaders";
$pcMap{"mkfontscale"} = "mkfontscale"; $pcMap{"mkfontscale"} = "mkfontscale";
$pcMap{"mkfontdir"} = "mkfontdir"; $pcMap{"mkfontdir"} = "mkfontdir";
$pcMap{"bdftopcf"} = "bdftopcf"; $pcMap{"bdftopcf"} = "bdftopcf";
@ -178,7 +179,7 @@ while (<>) {
process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g; process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g;
#push @requires, "mesa" if $pkg =~ /xorgserver/ or $pkg =~ /xf86videoi810/; #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, "zlib" if $pkg =~ /xorgserver/;
push @requires, "libxslt" if $pkg =~ /libxcb/; push @requires, "libxslt" if $pkg =~ /libxcb/;
@ -197,7 +198,7 @@ print OUT "";
print OUT <<EOF; print OUT <<EOF;
# This is a generated file. Do not edit! # This is a generated file. Do not edit!
{ stdenv, fetchurl, pkgconfig, freetype, fontconfig { stdenv, fetchurl, pkgconfig, freetype, fontconfig
, libxslt, expat, libdrm, libpng, zlib, perl, mesa , libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders
}: }:
rec { rec {
@ -241,3 +242,4 @@ EOF
print OUT "}\n"; print OUT "}\n";
close OUT; close OUT;
>

2
pkgs/servers/x11/xorg/tarballs
View File

@ -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-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-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-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-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-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 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-proto-1.0.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-0.1.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://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

7
pkgs/top-level/all-packages.nix
View File

@ -1575,6 +1575,11 @@ rec {
inherit (xlibs) libXmu libXi; inherit (xlibs) libXmu libXi;
}; };
mesaHeaders = import ../development/libraries/mesa/headers.nix {
inherit stdenv;
mesaSrc = mesa.src;
};
mpeg2dec = import ../development/libraries/mpeg2dec { mpeg2dec = import ../development/libraries/mpeg2dec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -2097,7 +2102,7 @@ rec {
xorg = recurseIntoAttrs (import ../servers/x11/xorg { xorg = recurseIntoAttrs (import ../servers/x11/xorg {
inherit fetchurl stdenv pkgconfig freetype fontconfig inherit fetchurl stdenv pkgconfig freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa; libxslt expat libdrm libpng zlib perl mesa mesaHeaders;
}); });