From 35bb7d64126194bbb83863974bb03845929f183f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 23 Apr 2009 10:24:40 +0000 Subject: [PATCH] Python-not-2.4 support for libxml2 svn path=/nixpkgs/trunk/; revision=15265 --- pkgs/development/libraries/libxml2/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index a1043bad67c..1a0b0557b14 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -3,7 +3,7 @@ assert zlib != null; assert pythonSupport -> python != null; -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "libxml2-2.6.32"; builder = ./builder.sh; @@ -19,4 +19,8 @@ stdenv.mkDerivation { propagatedBuildInputs = [zlib]; postInstall = "ensureDir $out/nix-support; cp ${./setup-hook.sh} $out/nix-support/setup-hook"; -} +} // (if pythonSupport then { + preConfigure = '' + sed -e "s^pythondir=.*$^pythondir=$(toPythonPath $out)^" < configure.old > configure + ''; +} else {}))