* 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;
|
assert pythonSupport -> python != null;
|
||||||
|
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation {
|
||||||
name = "libxml2-2.7.3";
|
name = "libxml2-2.7.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
@ -10,29 +10,18 @@ stdenv.mkDerivation ({
|
|||||||
sha256 = "01bgxgvl0gcx97zmlz9f2ivgbiv86kqbs9l93n2cbxywv1pc4jd5";
|
sha256 = "01bgxgvl0gcx97zmlz9f2ivgbiv86kqbs9l93n2cbxywv1pc4jd5";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = ''
|
configureFlags = ''
|
||||||
${if pythonSupport then "--with-python=${python}" else ""}
|
${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];
|
propagatedBuildInputs = [zlib];
|
||||||
|
|
||||||
postInstall = ''
|
setupHook = ./setup-hook.sh;
|
||||||
ensureDir $out/nix-support
|
|
||||||
cp ${./setup-hook.sh} $out/nix-support/setup-hook
|
passthru = {inherit pythonSupport;};
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://xmlsoft.org/;
|
homepage = http://xmlsoft.org/;
|
||||||
description = "A XML parsing library for C";
|
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