mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 06:45:16 +01:00
* libxml2 updated to 2.7.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13972
This commit is contained in:
parent
987c01630a
commit
205aa93e92
3 changed files with 33 additions and 28 deletions
|
@ -1,16 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
configureFlags="--with-zlib=$zlib"
|
||||
if test "$pythonSupport"; then
|
||||
configureFlags="--with-python=$python $configureFlags"
|
||||
fi
|
||||
|
||||
patchPhase() {
|
||||
echo "Patching"
|
||||
mv configure configure.old
|
||||
sed -e "s^pythondir=.*$^pythondir=$out/lib/python2.4/site-packages^" < configure.old > configure
|
||||
chmod u+x configure
|
||||
}
|
||||
patchPhase=patchPhase
|
||||
|
||||
genericBuild
|
|
@ -1,22 +1,34 @@
|
|||
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
|
||||
|
||||
assert zlib != null;
|
||||
assert pythonSupport -> python != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libxml2-2.6.32";
|
||||
builder = ./builder.sh;
|
||||
name = "libxml2-2.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://xmlsoft.org/libxml2/libxml2-2.6.32.tar.gz;
|
||||
sha256 = "0lsxr0akvp1sx29yh0nmzdhhc15dpa1i5chk40yaxjmgg6w2hi0v";
|
||||
url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.3.tar.gz;
|
||||
sha256 = "01bgxgvl0gcx97zmlz9f2ivgbiv86kqbs9l93n2cbxywv1pc4jd5";
|
||||
};
|
||||
|
||||
python = if pythonSupport then python else null;
|
||||
inherit pythonSupport zlib;
|
||||
configureFlags = ''
|
||||
${if pythonSupport then "--with-python=${python}" else ""}
|
||||
'';
|
||||
|
||||
patchPhase = ''
|
||||
sed -e "s^pythondir=.*$^pythondir=$out/lib/python2.4/site-packages^" -i configure
|
||||
'';
|
||||
|
||||
passthru = {inherit pythonSupport;};
|
||||
|
||||
buildInputs = if pythonSupport then [python] else [];
|
||||
propagatedBuildInputs = [zlib];
|
||||
|
||||
postInstall = "ensureDir $out/nix-support; cp ${./setup-hook.sh} $out/nix-support/setup-hook";
|
||||
postInstall = ''
|
||||
ensureDir $out/nix-support
|
||||
cp ${./setup-hook.sh} $out/nix-support/setup-hook
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://xmlsoft.org/;
|
||||
description = "A XML parsing library for C";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,13 +1,22 @@
|
|||
{stdenv, fetchurl, libxml2}:
|
||||
|
||||
assert libxml2 != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libxslt-1.1.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz;
|
||||
sha256 = "c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e";
|
||||
};
|
||||
|
||||
buildInputs = [libxml2];
|
||||
postInstall = "ensureDir $out/nix-support; ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/";
|
||||
|
||||
postInstall = ''
|
||||
ensureDir $out/nix-support
|
||||
ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://xmlsoft.org/XSLT/;
|
||||
description = "A C library and tools to do XSL transformations";
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue