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:44:16 +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
pkgs/servers/http/apache-httpd/2.4.nix
+1 -1
View File
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
${optionalString proxySupport "--enable-proxy"}
${optionalString sslSupport "--enable-ssl"}
${optionalString luaSupport "--enable-lua --with-lua=${lua5}"}
${optionalString libxml2Support "--with-libxml2=${libxml2}/include/libxml2"}
${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"}
'';
postInstall = ''
pkgs/servers/http/nginx/default.nix
+1 -1
View File
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = optionalString modsecurity "-I${aprutil}/include/apr-1 -I${apacheHttpd}/include -I${apr}/include/apr-1 -I${yajl}/include";
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags"
'';
meta = {
pkgs/servers/http/nginx/unstable.nix
+1 -1
View File
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations";
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags"
'';
postInstall = ''
pkgs/servers/http/openresty/default.nix
+1 -1
View File
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
'';
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags"
export PATH="$PATH:${stdenv.cc.libc.bin}/bin"
patchShebangs .
'';