From ea27b1b042e5fc3a071af76513d502258f51cfcb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Jul 2011 19:21:29 +0000 Subject: [PATCH] mesa: depend on python+libxml2Python rather than depending on pythonFull The latter package contains Tcl/Tk and whatnot else, so using that expression as a built input was a bad idea. I'm sorry. The dependency on talloc is gone, too. It wasn't used, apparently, but it broke the build on Darwin because talloc doesn't compile there. svn path=/nixpkgs/trunk/; revision=27784 --- pkgs/development/libraries/mesa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 5e2abb6065c..1274482091d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, flex, bison, pkgconfig, x11, xlibs, libdrm, file, expat -, pythonFull, lipo ? null, talloc }: +, python, libxml2Python, lipo ? null }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = [ ./swrast-settexbuffer.patch ]; postPatch = '' - find . -name "*.py" -exec sed -i -e "s|#! */usr/bin/env python|#! ${pythonFull}/bin/python|" {} + + find . -name "*.py" -exec sed -i -e "s|#! */usr/bin/env python|#! ${python}/bin/python|" {} + ''; configureFlags = @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto - lipo talloc file pythonFull flex bison + lipo file python libxml2Python flex bison ]; enableParallelBuilding = true;