From 2735e9c8d6aa444f4a07c26563cda71774d2ca0a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Fri, 14 Jun 2013 18:16:37 +1000 Subject: [PATCH 1/2] apacheHttpd: fix build on darwin * remove the gcc_s library from NIX_LDFLAGS (not available on darwin) --- pkgs/servers/http/apache-httpd/2.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index ba0bde63358..23d18ad7c9c 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -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} From 85f2674e22c294ac194caff765c55888a716be8a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sat, 15 Jun 2013 22:02:58 +1000 Subject: [PATCH 2/2] apacheHttpd: minor modifications to meta attrs * add myself as a maintainer * use reference to `stdenv.lib.licenses.asl20` rather than literal string --- pkgs/servers/http/apache-httpd/2.2.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index 23d18ad7c9c..23454d048b7 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -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 ]; }; }