* Mesa 7.0.3.

svn path=/nixpkgs/trunk/; revision=10898
This commit is contained in:
Eelco Dolstra 2008-03-01 17:44:50 +00:00
parent 50348f5258
commit 55fd683572

View File

@ -7,14 +7,20 @@ let
if stdenv.system == "x86_64-linux" then "linux-dri-x86-64" else if stdenv.system == "x86_64-linux" then "linux-dri-x86-64" else
abort "unsupported platform for Mesa"; # !!! change to throw, remove all the mesa asserts in all-packages.nix abort "unsupported platform for Mesa"; # !!! change to throw, remove all the mesa asserts in all-packages.nix
# Missing file in 7.0.2. Can be removed for >= 7.0.3.
missingPC = fetchurl {
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/mesa/files/7.0.2-glw.pc.in?rev=1.1";
sha256 = "1z4d50pllwi8g6n567dk3zxq4qmam79n72wr55mdqx0jrdj4fj0v";
};
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mesa-7.0.1"; name = "mesa-7.0.2";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/mesa3d/MesaLib-7.0.1.tar.bz2; url = mirror://sourceforge/mesa3d/MesaLib-7.0.2.tar.bz2;
md5 = "c056abd763e899114bf745c9eedbf9ad"; md5 = "93e6ed7924ff069a4f883b4fce5349dc";
}; };
/* (fetchurl { /* (fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/MesaGLUT-6.4.tar.bz2; url = http://nix.cs.uu.nl/dist/tarballs/MesaGLUT-6.4.tar.bz2;
@ -29,6 +35,7 @@ stdenv.mkDerivation {
preBuild = " preBuild = "
makeFlagsArray=(INSTALL_DIR=$out DRI_DRIVER_INSTALL_DIR=$out/lib/modules/dri SHELL=$SHELL) makeFlagsArray=(INSTALL_DIR=$out DRI_DRIVER_INSTALL_DIR=$out/lib/modules/dri SHELL=$SHELL)
cp ${missingPC} src/glw/glw.pc.in
"; ";
buildInputs = [ buildInputs = [
@ -39,7 +46,7 @@ stdenv.mkDerivation {
passthru = {inherit libdrm;}; passthru = {inherit libdrm;};
meta = { meta = {
description = "OpenGL-compatible 3D library. Supports acceleration."; description = "An open source implementation of OpenGL";
homepage = http://www.mesa3d.org/; homepage = http://www.mesa3d.org/;
}; };
} }