public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libxml2,libxslt: split into multiple outputs

Browse Source 
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
This commit is contained in:
Vladimír Čunát
2015-10-05 13:23:01 +02:00
parent f8c211fd2b
commit 38313d5d87
32 changed files with 83 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/php/default.nix
View File

@@ -67,7 +67,7 @@ let
libxml2 = {
configureFlags = [
"--with-libxml-dir=${libxml2}"
"--with-libxml-dir=${libxml2.dev}"
];
buildInputs = [ libxml2 ];
};

12
pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
View File

@@ -63,12 +63,12 @@ in
buildFlags = [
"--use-system-libraries"
"--with-zlib-dir=${zlib}"
"--with-xml2-lib=${libxml2}/lib"
"--with-xml2-include=${libxml2}/include/libxml2"
"--with-xslt-lib=${libxslt}/lib"
"--with-xslt-include=${libxslt}/include"
"--with-exslt-lib=${libxslt}/lib"
"--with-exslt-include=${libxslt}/include"
"--with-xml2-lib=${libxml2.out}/lib"
"--with-xml2-include=${libxml2.dev}/include/libxml2"
"--with-xslt-lib=${libxslt.out}/lib"
"--with-xslt-include=${libxslt.dev}/include"
"--with-exslt-lib=${libxslt.out}/lib"
"--with-exslt-include=${libxslt.dev}/include"
] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
};

4
pkgs/development/interpreters/ruby/patches.nix
View File

@@ -82,8 +82,8 @@ in
nokogiri = {
buildInputs = [ libxml2 ];
buildFlags =
[ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2"
"--with-xslt-dir=${libxslt} --use-system-libraries"
[ "--with-xml2-dir=${libxml2.out} --with-xml2-include=${libxml2.dev}/include/libxml2"
"--with-xslt-dir=${libxslt.out} --use-system-libraries"
libiconv
];
};