From ccb7715de88f3bef875b6e9bae7994e1f72fa910 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 7 Jul 2013 19:02:56 +1000 Subject: [PATCH] apacheHttpd_2_4: fix build on darwin --- pkgs/servers/http/apache-httpd/2.4.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index da353212657..bbf84a852b8 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { optional libxml2Support libxml2; # Required for ‘pthread_cancel’. - NIX_LDFLAGS = "-lgcc_s"; + NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; configureFlags = '' --with-apr=${apr} @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { inherit apr aprutil sslSupport proxySupport ldapSupport; }; - meta = { + meta = with stdenv.lib; { description = "Apache HTTPD, the world's most popular web server"; - homepage = "http://httpd.apache.org/"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + homepage = http://httpd.apache.org/; + license = licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ lovek323 simons ]; }; }