diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 13:23:01 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 13:44:16 +0200 |
commit | 38313d5d877fc421d1381971051107e4b03dc40d (patch) | |
tree | 8143c1a0d11cd8d0cf10fe59a67508baa975ffba /pkgs/servers | |
parent | f8c211fd2b53d970a439d643bea9d0928fb08666 (diff) | |
download | nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.gz nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.bz2 nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.lz nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.xz nixlib-38313d5d877fc421d1381971051107e4b03dc40d.tar.zst nixlib-38313d5d877fc421d1381971051107e4b03dc40d.zip |
libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully. libxml2Python is slightly hacky now, but it seems to work.
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/unstable.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/openresty/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index bcfd885ae012..1ab3eaf03824 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -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 = '' diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 54f4e1599b8c..6866dc008616 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -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 = { diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index e71adba3e572..4806eabc361a 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -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 = '' diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index aac626282905..147e24c014d2 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -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 . ''; |