summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-03-01 17:44:50 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-03-01 17:44:50 +0000
commit55fd6835723c08fe5661b7c39b212432ee99bfa8 (patch)
treec5b1db02d592039faa75f58992e4f11f76e1948a
parent50348f525889dd25e62af0ba0e655c209d9d875b (diff)
downloadnixpkgs-55fd6835723c08fe5661b7c39b212432ee99bfa8.tar
nixpkgs-55fd6835723c08fe5661b7c39b212432ee99bfa8.tar.gz
nixpkgs-55fd6835723c08fe5661b7c39b212432ee99bfa8.tar.bz2
nixpkgs-55fd6835723c08fe5661b7c39b212432ee99bfa8.tar.lz
nixpkgs-55fd6835723c08fe5661b7c39b212432ee99bfa8.tar.xz
nixpkgs-55fd6835723c08fe5661b7c39b212432ee99bfa8.tar.zst
nixpkgs-55fd6835723c08fe5661b7c39b212432ee99bfa8.zip
* Mesa 7.0.3.
svn path=/nixpkgs/trunk/; revision=10898
-rw-r--r--pkgs/development/libraries/mesa/default.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 07d308eb4df..9b78d546371 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -7,14 +7,20 @@ let
     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
 
+  # 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
 
 stdenv.mkDerivation {
-  name = "mesa-7.0.1";
+  name = "mesa-7.0.2";
   
   src = fetchurl {
-    url = mirror://sourceforge/mesa3d/MesaLib-7.0.1.tar.bz2;
-    md5 = "c056abd763e899114bf745c9eedbf9ad";
+    url = mirror://sourceforge/mesa3d/MesaLib-7.0.2.tar.bz2;
+    md5 = "93e6ed7924ff069a4f883b4fce5349dc";
   };
 /*    (fetchurl {
       url = http://nix.cs.uu.nl/dist/tarballs/MesaGLUT-6.4.tar.bz2;
@@ -29,6 +35,7 @@ stdenv.mkDerivation {
   
   preBuild = "
     makeFlagsArray=(INSTALL_DIR=$out DRI_DRIVER_INSTALL_DIR=$out/lib/modules/dri SHELL=$SHELL)
+    cp ${missingPC} src/glw/glw.pc.in
   ";
   
   buildInputs = [
@@ -39,7 +46,7 @@ stdenv.mkDerivation {
   passthru = {inherit libdrm;};
   
   meta = {
-    description = "OpenGL-compatible 3D library. Supports acceleration.";
+    description = "An open source implementation of OpenGL";
     homepage = http://www.mesa3d.org/;
   };
 }