Author: simons
Date: Thu Jul 14 19:21:29 2011
New Revision: 27784
URL: https://svn.nixos.org/websvn/nix/?rev=27784&sc=1
Log:
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.
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
19:21:23 2011 (r27783)
+++ nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Thu Jul 14
19:21:29 2011 (r27784)
@@ -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 @@
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 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
