public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apacheHttpd_2_2: Fix setting installbuilddir 

Otherwise mod_dnssd doesn't build.

Also move apxs to $dev.
This commit is contained in:
Tuomas Tynkkynen 2015-10-21 00:22:12 +03:00 committed by Vladimír Čunát
parent 311ac81337
commit b81515c2d4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/servers/http/apache-httpd/2.2.nix
View File

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk"; sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk";
}; };
# FIXME: -dev depends on -doc
outputs = [ "dev" "out" "doc" ]; outputs = [ "dev" "out" "doc" ];
buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++ buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++
@ -33,6 +34,10 @@ stdenv.mkDerivation rec {
# Required for ‘pthread_cancel’. # Required for ‘pthread_cancel’.
NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s"); NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s");
patchPhase = ''
sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
'';
configureFlags = '' configureFlags = ''
--with-z=${zlib} --with-z=${zlib}
--with-pcre=${pcre} --with-pcre=${pcre}
@ -48,11 +53,6 @@ stdenv.mkDerivation rec {
--enable-mem-cache --enable-mem-cache
''; '';
preConfigure =
''
makeFlagsArray+=("installbuilddir=$dev/share/build")
'';
enableParallelBuilding = true; enableParallelBuilding = true;
stripDebugList = "lib modules bin"; stripDebugList = "lib modules bin";
@ -60,7 +60,8 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
mkdir -p $doc/share/doc/httpd mkdir -p $doc/share/doc/httpd
mv $out/manual $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 = { passthru = {