diff options
| author | Robin Gloster <mail@glob.in> | 2019-11-10 00:52:53 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 01:09:25 +0100 |
| commit | 760e23136acfc192fd9a51b6b3c63fbc0a0c999d (patch) | |
| tree | 580b5353463a389247f8225b618091af816e329f /pkgs/servers | |
| parent | 01e8c649889a0a9493a38505023f7e33d98d8446 (diff) | |
| download | nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar.gz nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar.bz2 nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar.lz nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar.xz nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.tar.zst nixpkgs-760e23136acfc192fd9a51b6b3c63fbc0a0c999d.zip | |
treewide: *inputs are lists
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 63861714145..d5da6df8d68 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -44,10 +44,6 @@ stdenv.mkDerivation rec { # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - preConfigure = '' - configureFlags="$configureFlags --includedir=$dev/include" - ''; - configureFlags = [ "--with-apr=${apr.dev}" "--with-apr-util=${aprutil.dev}" @@ -60,6 +56,7 @@ stdenv.mkDerivation rec { "--enable-cern-meta" "--enable-imagemap" "--enable-cgi" + "--includedir=${placeholder "dev"}/include" (stdenv.lib.enableFeature proxySupport "proxy") (stdenv.lib.enableFeature sslSupport "ssl") (stdenv.lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") |