summaryrefslogtreecommitdiffstats
path: root/pkgs/development
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-05-16 21:55:18 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-05-16 21:55:18 +0000
commit5755aa2ce9c4c4e0b86d049fd96ed6d2e40a07d1 (patch)
tree269cae1d29e1807e045189fd8385e1002144f2a0 /pkgs/development
parent21bf5ef509dcadebab10de0ba142d55776a961f1 (diff)
* Mesa updated to 8.0.2.
svn path=/nixpkgs/branches/x-updates/; revision=34143
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/mesa/default.nix13
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 219dc161761b..1c5285c6f5d7 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -7,27 +7,24 @@ if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
else
-let version = "7.11.2"; in
+let version = "8.0.2"; in
stdenv.mkDerivation {
name = "mesa-${version}";
src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
- sha256 = "0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p";
+ md5 = "a368104e5700707048dc3e8691a9a7a1";
};
- patches = [ ./swrast-settexbuffer.patch ] ++ stdenv.lib.optional
- (stdenv.system == "mips64el-linux") ./mips_wmb.patch;
+ patches =
+ stdenv.lib.optional (stdenv.system == "mips64el-linux") ./mips_wmb.patch;
prePatch = "patchShebangs .";
-# r300
configureFlags =
- " --with-driver=dri --enable-gl-osmesa --enable-gles1"
+ " --enable-gles1 --enable-gles2 --enable-gallium-egl"
+ " --with-gallium-drivers=i915,nouveau,r600,svga,swrast"
- + " --enable-gles2 --enable-gallium-egl --disable-glx-tls"
- + " --enable-xcb --enable-egl --disable-glut"
# Texture floats are patented, see docs/patents.txt
+ stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";