diff options
| author | Danny Wilson <danny@onlinetouch.nl> | 2013-02-27 18:15:57 +0100 |
|---|---|---|
| committer | Danny Wilson <danny@onlinetouch.nl> | 2013-02-28 20:04:03 +0100 |
| commit | c041dbb1d2ca5d52dd837564a4b73d48c52175a7 (patch) | |
| tree | 56064db9f023f99cfb5aafe5e64b0b38d3d1a371 /pkgs/development/libraries/libxslt | |
| parent | 82240c899adc77ac6cdddf9f1dafc4eedcf60cd4 (diff) | |
| download | nixlib-c041dbb1d2ca5d52dd837564a4b73d48c52175a7.tar nixlib-c041dbb1d2ca5d52dd837564a4b73d48c52175a7.tar.gz nixlib-c041dbb1d2ca5d52dd837564a4b73d48c52175a7.tar.bz2 nixlib-c041dbb1d2ca5d52dd837564a4b73d48c52175a7.tar.lz nixlib-c041dbb1d2ca5d52dd837564a4b73d48c52175a7.tar.xz nixlib-c041dbb1d2ca5d52dd837564a4b73d48c52175a7.tar.zst nixlib-c041dbb1d2ca5d52dd837564a4b73d48c52175a7.zip | |
Fix libxslt build on Illumos.
Diffstat (limited to 'pkgs/development/libraries/libxslt')
| -rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/libxslt/patch-ah.patch | 69 |
2 files changed, 73 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index d3b7769754e9..56acc841c60e 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, libxml2 }: stdenv.mkDerivation rec { - name = "libxslt-1.1.27"; + name = "libxslt-1.1.28"; src = fetchurl { url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; - sha256 = "09ky3vhlaahvsb0q9gp6h3as53pfj70gincirachjqzj46jdka5n"; + sha256 = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c"; }; buildInputs = [ libxml2 ]; + patches = stdenv.lib.optionals stdenv.isSunOS [ ./patch-ah.patch ]; + postInstall = '' mkdir -p $out/nix-support ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/ diff --git a/pkgs/development/libraries/libxslt/patch-ah.patch b/pkgs/development/libraries/libxslt/patch-ah.patch new file mode 100644 index 000000000000..ea75b01178e3 --- /dev/null +++ b/pkgs/development/libraries/libxslt/patch-ah.patch @@ -0,0 +1,69 @@ +$NetBSD: patch-ah,v 1.3 2012/11/27 12:17:51 adam Exp $ + +Fix syms file for stricter solaris ld + +--- libxslt-1.1.28/libxslt/libxslt.syms.orig 2012-11-27 12:04:43.000000000 +0000 ++++ libxslt-1.1.28/libxslt/libxslt.syms +@@ -107,7 +107,7 @@ LIBXML2_1.0.11 { + xsltFreeCompMatchList; + xsltFreeTemplateHashes; + xsltGetTemplate; +- xsltMatchPattern; ++# xsltMatchPattern; + xsltTestCompMatchList; + + # preproc +@@ -407,7 +407,7 @@ LIBXML2_1.1.18 { + global: + + # xsltInternals +- xsltConstNamespaceNameXSLT; # variable ++# xsltConstNamespaceNameXSLT; # variable + xsltExtensionInstructionResultFinalize; + xsltExtensionInstructionResultRegister; + xsltInitCtxtKey; +@@ -416,24 +416,24 @@ LIBXML2_1.1.18 { + xsltInit; + + # xsltInternals +- xsltParseAnyXSLTElem; +- xsltParseSequenceConstructor; +- xsltPointerListAddSize; +- xsltPointerListClear; +- xsltPointerListCreate; +- xsltPointerListFree; ++# xsltParseAnyXSLTElem; ++# xsltParseSequenceConstructor; ++# xsltPointerListAddSize; ++# xsltPointerListClear; ++# xsltPointerListCreate; ++# xsltPointerListFree; + xsltRegisterLocalRVT; + xsltReleaseRVT; +- xsltRestoreDocumentNamespaces; ++# xsltRestoreDocumentNamespaces; + + # extensions +- xsltStyleStylesheetLevelGetExtData; ++# xsltStyleStylesheetLevelGetExtData; + + # xsltInternals + # xsltTransStorageAdd; removed in 1.1.28 + # xsltTransStorageRemove; removed in 1.1.28 + xsltUninit; +- xsltXSLTAttrMarker; # variable ++# xsltXSLTAttrMarker; # variable + } LIBXML2_1.1.9; + + LIBXML2_1.1.20 { +@@ -476,6 +476,10 @@ LIBXML2_1.1.26 { + + # transform + xsltProcessOneNode; ++ ++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local") ++ local: ++ *; + } LIBXML2_1.1.25; + + LIBXML2_1.1.27 { |