diff options
| author | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-06-17 22:38:29 -0700 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-06-17 22:38:29 -0700 |
| commit | 0e577252611316fee297781ed2b43325c67d0d71 (patch) | |
| tree | 29ae6c9bc0c6aae3097f15a6e55cdb36dc68462f /pkgs | |
| parent | d8806940d60f27fe22a1c8fff6ee11e2d204c58a (diff) | |
| parent | 85f2674e22c294ac194caff765c55888a716be8a (diff) | |
| download | nixpkgs-0e577252611316fee297781ed2b43325c67d0d71.tar nixpkgs-0e577252611316fee297781ed2b43325c67d0d71.tar.gz nixpkgs-0e577252611316fee297781ed2b43325c67d0d71.tar.bz2 nixpkgs-0e577252611316fee297781ed2b43325c67d0d71.tar.lz nixpkgs-0e577252611316fee297781ed2b43325c67d0d71.tar.xz nixpkgs-0e577252611316fee297781ed2b43325c67d0d71.tar.zst nixpkgs-0e577252611316fee297781ed2b43325c67d0d71.zip | |
Merge pull request #633 from lovek323/httpd
apacheHttpd: fix build on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index ba0bde63358..23454d048b7 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} @@ -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 ]; }; } |