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

Merge pull request #633 from lovek323/httpd

Browse Source 
apacheHttpd: fix build on darwin
This commit is contained in:
Evgeny Egorochkin 2013-06-17 22:38:29 -07:00
commit 0e57725261
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-iquote ${apr}/include/apr-1";
# Required for ‘pthread_cancel’.
NIX_LDFLAGS = "-lgcc_s";
NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s");
configureFlags = ''
--with-z=${zlib}
@ -55,10 +55,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Apache HTTPD, the world's most popular web server";
homepage = http://httpd.apache.org/;
license = "ASL2.0";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
homepage = http://httpd.apache.org/;
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ simons lovek323 ];
};
}