diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-10-08 16:56:52 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-10-08 16:56:52 +0000 |
commit | ee07abad6064ea777e1436aa36dfafb4b6822632 (patch) | |
tree | a0e92d5416cf5759a4c5f2bd7ce849ec9ec6b6da /pkgs/development/libraries | |
parent | 643a16f6e2ed184c9716d409e5942a264ce079b4 (diff) | |
download | nixlib-ee07abad6064ea777e1436aa36dfafb4b6822632.tar nixlib-ee07abad6064ea777e1436aa36dfafb4b6822632.tar.gz nixlib-ee07abad6064ea777e1436aa36dfafb4b6822632.tar.bz2 nixlib-ee07abad6064ea777e1436aa36dfafb4b6822632.tar.lz nixlib-ee07abad6064ea777e1436aa36dfafb4b6822632.tar.xz nixlib-ee07abad6064ea777e1436aa36dfafb4b6822632.tar.zst nixlib-ee07abad6064ea777e1436aa36dfafb4b6822632.zip |
* Mesa 7.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13004
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9b78d5463712..c44ff082720e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm}: +{stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat}: let @@ -7,40 +7,19 @@ 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.2"; + name = "mesa-7.2"; src = fetchurl { - url = mirror://sourceforge/mesa3d/MesaLib-7.0.2.tar.bz2; - md5 = "93e6ed7924ff069a4f883b4fce5349dc"; + url = mirror://sourceforge/mesa3d/MesaLib-7.2.tar.bz2; + md5 = "04d379292e023df0b0266825cb0dbde5"; }; -/* (fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/MesaGLUT-6.4.tar.bz2; - md5 = "1a8c4d4fc699233f5fdb902b8753099e"; - }) - (fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/MesaDemos-6.4.tar.bz2; - md5 = "1a8c4d4fc699233f5fdb902b8753099e"; - }) */ - - buildFlags = "${target}"; - - preBuild = " - makeFlagsArray=(INSTALL_DIR=$out DRI_DRIVER_INSTALL_DIR=$out/lib/modules/dri SHELL=$SHELL) - cp ${missingPC} src/glw/glw.pc.in - "; buildInputs = [ - pkgconfig x11 xlibs.makedepend libdrm xlibs.glproto xlibs.libXmu - xlibs.libXi xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage + pkgconfig expat x11 libdrm xlibs.glproto + xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage ]; passthru = {inherit libdrm;}; |