diff options
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 80 | ||||
| -rw-r--r-- | pkgs/servers/http/apache-modules/mod_dnssd/default.nix | 10 |
2 files changed, 7 insertions, 83 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix deleted file mode 100644 index 8cab241f85c..00000000000 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, perl, zlib -, sslSupport, proxySupport ? true -, apr, aprutil, pcre -, ldapSupport ? true, openldap -, # Multi-processing module to use. This is built into the server and - # cannot be selected at runtime. - mpm ? "prefork" -}: - -assert sslSupport -> openssl != null; -assert ldapSupport -> aprutil.ldapSupport && openldap != null; -assert mpm == "prefork" || mpm == "worker" || mpm == "event"; - -stdenv.mkDerivation rec { - version = "2.2.31"; - name = "apache-httpd-${version}"; - - src = fetchurl { - url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk"; - }; - - # FIXME: -dev depends on -doc - outputs = [ "out" "dev" "doc" ]; - setOutputFlags = false; # it would move $out/modules, etc. - - propagatedBuildInputs = [ apr ]; # otherwise mod_* fail to find includes often - buildInputs = [ pkgconfig perl aprutil pcre zlib ] ++ - stdenv.lib.optional sslSupport openssl; - - # Required for ‘pthread_cancel’. - NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s"); - - patchPhase = '' - sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" - ''; - - preConfigure = '' - configureFlags="$configureFlags --includedir=$dev/include" - ''; - configureFlags = '' - --with-z=${zlib.dev} - --with-pcre=${pcre.dev} - --enable-mods-shared=all - --enable-authn-alias - ${if proxySupport then "--enable-proxy" else ""} - ${if sslSupport then "--enable-ssl --with-ssl=${openssl.dev}" else ""} - ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} - --with-mpm=${mpm} - --enable-cache - --enable-disk-cache - --enable-file-cache - --enable-mem-cache - --docdir=$(doc)/share/doc - ''; - - enableParallelBuilding = true; - - stripDebugList = "lib modules bin"; - - postInstall = '' - mkdir -p $doc/share/doc/httpd - mv $out/manual $doc/share/doc/httpd - mkdir -p $dev/bin - mv $out/bin/apxs $dev/bin/apxs - ''; - - passthru = { - inherit apr aprutil sslSupport proxySupport; - }; - - meta = { - description = "Apache HTTPD, the world's most popular web server"; - branch = "2.2"; - homepage = http://httpd.apache.org/; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - }; -} diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 06f12820a10..80cbf12d2a6 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, apacheHttpd_2_2, apr, avahi }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }: stdenv.mkDerivation rec { name = "mod_dnssd-0.6"; @@ -10,7 +10,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; - buildInputs = [ pkgconfig apacheHttpd_2_2 avahi apr ]; + buildInputs = [ pkgconfig apacheHttpd avahi apr ]; + + patches = [ (fetchpatch { + url = "http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/mod-dnssd/vivid/download/package-import%40ubuntu.com-20130530193334-kqebiy78q534or5k/portforapache2.4.pat-20130530222510-7tlw5btqchd04edb-3/port-for-apache2.4.patch"; + sha256 = "1hgcxwy1q8fsxfqyg95w8m45zbvxzskf1jxd87ljj57l7x1wwp4r"; + }) ]; installPhase = '' mkdir -p $out/modules @@ -25,4 +30,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lethalman ]; }; } - |