alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

mesa: depend on python+libxml2Python rather than depending on pythonFull

Browse source 
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
This commit is contained in:
Peter Simons 2011-07-14 19:21:29 +00:00
parent 05e489b24f
commit ea27b1b042
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/mesa/default.nix
View file

@ -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;