* libxml2 updated to 2.7.3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13972
This commit is contained in:
Eelco Dolstra 2009-02-03 16:14:23 +00:00
parent 987c01630a
commit 205aa93e92
3 changed files with 33 additions and 28 deletions

View File

@ -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

View File

@ -1,22 +1,34 @@
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}: {stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
assert zlib != null;
assert pythonSupport -> python != null; assert pythonSupport -> python != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libxml2-2.6.32"; name = "libxml2-2.7.3";
builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxml2-2.6.32.tar.gz; url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.3.tar.gz;
sha256 = "0lsxr0akvp1sx29yh0nmzdhhc15dpa1i5chk40yaxjmgg6w2hi0v"; sha256 = "01bgxgvl0gcx97zmlz9f2ivgbiv86kqbs9l93n2cbxywv1pc4jd5";
}; };
python = if pythonSupport then python else null; configureFlags = ''
inherit pythonSupport zlib; ${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]; 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";
};
} }

View File

@ -1,13 +1,22 @@
{stdenv, fetchurl, libxml2}: {stdenv, fetchurl, libxml2}:
assert libxml2 != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libxslt-1.1.24"; name = "libxslt-1.1.24";
src = fetchurl { src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz; url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz;
sha256 = "c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e"; sha256 = "c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e";
}; };
buildInputs = [libxml2]; 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";
};
} }