diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-07 23:51:27 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-08 00:25:04 +0000 |
| commit | 096ca241d9505c265fe46cacec7b316eecb401ad (patch) | |
| tree | 1c4f5daadf7a0f2544ef9b1d219ddcca6867df0d /pkgs/servers/http/apache-httpd/2.4.nix | |
| parent | 1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (diff) | |
| parent | 5f6df74f66246a2eb198b0bc3fe1f7d2dff57062 (diff) | |
| download | nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.gz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.bz2 nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.lz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.xz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.zst nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/servers/http/apache-httpd/2.4.nix')
| -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") |