Author: simons Date: Thu Jul 14 12:22:55 2011 New Revision: 27777 URL: https://svn.nixos.org/websvn/nix/?rev=27777&sc=1
Log: mesa: updated to version 7.10.2 There changes are based on patch <http://sprunge.us/bOMG> from goibhniu. Modified: nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Modified: nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Thu Jul 14 12:22:49 2011 (r27776) +++ nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Thu Jul 14 12:22:55 2011 (r27777) @@ -1,23 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null, talloc }: +{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, file, expat, pythonFull, lipo ? null, talloc }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" else -let version = "7.10.1"; in +let version = "7.10.2"; in stdenv.mkDerivation { name = "mesa-${version}"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";; - md5 = "efe8da4d80c2a5d32a800770b8ce5dfa"; + sha256 = "1hf7f6n5ms674v3bv5c9mrcg30kbraijxacl8s031kqirrw2dvcc"; }; patches = [ ./swrast-settexbuffer.patch ]; + postPatch = '' + find . -name "*.py" -exec sed -i -e "s|#! */usr/bin/env python|#! ${pythonFull}/bin/python|" {} + + ''; + configureFlags = - "--disable-gallium" + "--enable-gallium --enable-gl-osmesa --with-dri-drivers=swrast,radeon,r600 " + stdenv.lib.optionalString (stdenv.system == "mips64-linux") " --with-dri-drivers=swrast --with-driver=dri" + stdenv.lib.optionalString stdenv.isDarwin " --disable-egl"; @@ -25,7 +29,7 @@ buildInputs = [ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto - lipo talloc + lipo talloc file pythonFull ]; enableParallelBuilding = true; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
