ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Fix libxslt build on Illumos.

Browse Source
This commit is contained in:
Danny Wilson 2013-02-27 18:15:57 +01:00
parent 82240c899a
commit c041dbb1d2
2 changed files with 73 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libxslt/default.nix
View File

@ -1,15 +1,17 @@
{ stdenv, fetchurl, libxml2 }: { stdenv, fetchurl, libxml2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libxslt-1.1.27"; name = "libxslt-1.1.28";
src = fetchurl { src = fetchurl {
url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
sha256 = "09ky3vhlaahvsb0q9gp6h3as53pfj70gincirachjqzj46jdka5n"; sha256 = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c";
}; };
buildInputs = [ libxml2 ]; buildInputs = [ libxml2 ];
patches = stdenv.lib.optionals stdenv.isSunOS [ ./patch-ah.patch ];
postInstall = '' postInstall = ''
mkdir -p $out/nix-support mkdir -p $out/nix-support
ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/ ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/

69
pkgs/development/libraries/libxslt/patch-ah.patch Normal file
View File

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