diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2012-10-17 15:38:09 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2012-10-17 15:56:07 +0200 |
| commit | 2f3dcb9dd225dd6f7b6e59c8763d80624dfcad9e (patch) | |
| tree | 85ed9b71e27142018796de7e33054dbe309bce40 /pkgs/servers | |
| parent | 07f44ad945055c1cb72aab33ffda80905bca2022 (diff) | |
| download | nixpkgs-2f3dcb9dd225dd6f7b6e59c8763d80624dfcad9e.tar nixpkgs-2f3dcb9dd225dd6f7b6e59c8763d80624dfcad9e.tar.gz nixpkgs-2f3dcb9dd225dd6f7b6e59c8763d80624dfcad9e.tar.bz2 nixpkgs-2f3dcb9dd225dd6f7b6e59c8763d80624dfcad9e.tar.lz nixpkgs-2f3dcb9dd225dd6f7b6e59c8763d80624dfcad9e.tar.xz nixpkgs-2f3dcb9dd225dd6f7b6e59c8763d80624dfcad9e.tar.zst nixpkgs-2f3dcb9dd225dd6f7b6e59c8763d80624dfcad9e.zip | |
apache-httpd/2.4: Fix libxml2 support.
The reason because the configure script is unnable to find libxml2 is because it
is searching for a header file in `libxml/*.h`. Obviously this cases an error,
because it's actually in `${libxml2}/include/libxml2/libxml/*.h`, so let's add
the parent directory to --with-libxml2 and remove the comment from buildInputs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 44fa145b605..ed0c3ec6ea9 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [perl] ++ optional ldapSupport openldap ++ # there is no --with-ldap flag - optional libxml2Support libxml2; # there is --with-libxml2, but it doesn't work + optional libxml2Support libxml2; # Required for ‘pthread_cancel’. NIX_LDFLAGS = "-lgcc_s"; @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { ${optionalString proxySupport "--enable-proxy"} ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} + ${optionalString libxml2Support "--with-libxml2=${libxml2}/include/libxml2"} ''; postInstall = '' |