diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-21 00:22:12 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:23:02 +0100 |
| commit | b81515c2d422868de745ebb8989b67a243e674a4 (patch) | |
| tree | a55e4ac38a0d3d3c714afa943af3d7bab727da50 /pkgs | |
| parent | 311ac81337df766e4b3fbdca92833b5df5b4ff8a (diff) | |
| download | nixpkgs-b81515c2d422868de745ebb8989b67a243e674a4.tar nixpkgs-b81515c2d422868de745ebb8989b67a243e674a4.tar.gz nixpkgs-b81515c2d422868de745ebb8989b67a243e674a4.tar.bz2 nixpkgs-b81515c2d422868de745ebb8989b67a243e674a4.tar.lz nixpkgs-b81515c2d422868de745ebb8989b67a243e674a4.tar.xz nixpkgs-b81515c2d422868de745ebb8989b67a243e674a4.tar.zst nixpkgs-b81515c2d422868de745ebb8989b67a243e674a4.zip | |
apacheHttpd_2_2: Fix setting installbuilddir
Otherwise mod_dnssd doesn't build. Also move apxs to $dev.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index 515446bc9b9..9974e901a02 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk"; }; + # FIXME: -dev depends on -doc outputs = [ "dev" "out" "doc" ]; buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++ @@ -33,6 +34,10 @@ stdenv.mkDerivation rec { # Required for ‘pthread_cancel’. NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s"); + patchPhase = '' + sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" + ''; + configureFlags = '' --with-z=${zlib} --with-pcre=${pcre} @@ -48,11 +53,6 @@ stdenv.mkDerivation rec { --enable-mem-cache ''; - preConfigure = - '' - makeFlagsArray+=("installbuilddir=$dev/share/build") - ''; - enableParallelBuilding = true; stripDebugList = "lib modules bin"; @@ -60,7 +60,8 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $doc/share/doc/httpd mv $out/manual $doc/share/doc/httpd - mkdir -p $out/share # FIXME, hack + mkdir -p $dev/bin + mv $out/sbin/apxs $dev/bin/apxs ''; passthru = { |