* Apparently the pythondir hack isn't needed with libxml2 2.7.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15272
This commit is contained in:
parent
a61894ea81
commit
7a891eabe2
@ -2,7 +2,7 @@
|
||||
|
||||
assert pythonSupport -> python != null;
|
||||
|
||||
stdenv.mkDerivation ({
|
||||
stdenv.mkDerivation {
|
||||
name = "libxml2-2.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
@ -14,25 +14,14 @@ stdenv.mkDerivation ({
|
||||
${if pythonSupport then "--with-python=${python}" else ""}
|
||||
'';
|
||||
|
||||
patchPhase = ''
|
||||
sed -e "s^pythondir=.*$^pythondir=$out/lib/python2.4/site-packages^" -i configure
|
||||
'';
|
||||
|
||||
passthru = {inherit pythonSupport;};
|
||||
|
||||
propagatedBuildInputs = [zlib];
|
||||
|
||||
postInstall = ''
|
||||
ensureDir $out/nix-support
|
||||
cp ${./setup-hook.sh} $out/nix-support/setup-hook
|
||||
'';
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
passthru = {inherit pythonSupport;};
|
||||
|
||||
meta = {
|
||||
homepage = http://xmlsoft.org/;
|
||||
description = "A XML parsing library for C";
|
||||
};
|
||||
} // (if pythonSupport then {
|
||||
preConfigure = ''
|
||||
sed -e "s^pythondir=.*$^pythondir=$(toPythonPath $out)^" < configure.old > configure
|
||||
'';
|
||||
} else {}))
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user