diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
| commit | c92bca56f8ea5623cf01952621455db308d0f330 (patch) | |
| tree | f940e6e4fabd8e58b91fe885f9541205258023b2 /pkgs/servers/http | |
| parent | 0fdde5efd08c036fe9d73b4e65f2ba9797053d0f (diff) | |
| parent | 94520a25adc6b6bee799ec9dab344cfdad3f7180 (diff) | |
| download | nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.gz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.bz2 nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.lz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.xz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.zst nixlib-c92bca56f8ea5623cf01952621455db308d0f330.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/http/nix-binary-cache/default.nix | 4 |
2 files 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 a39d0e8e3158..f69001da08ac 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv , proxySupport ? true , sslSupport ? true, openssl -, http2Support ? true, libnghttp2 +, http2Support ? true, nghttp2 , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 , luaSupport ? false, lua5 @@ -13,7 +13,7 @@ in assert sslSupport -> aprutil.sslSupport && openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; -assert http2Support -> libnghttp2 != null; +assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { version = "2.4.18"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { optional sslSupport openssl ++ optional ldapSupport openldap ++ # there is no --with-ldap flag optional libxml2Support libxml2 ++ - optional http2Support libnghttp2 ++ + optional http2Support nghttp2 ++ optional stdenv.isDarwin libiconv; patchPhase = '' @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { --enable-cgi ${optionalString proxySupport "--enable-proxy"} ${optionalString sslSupport "--enable-ssl"} - ${optionalString http2Support "--enable-http2 --with-nghttp2=${libnghttp2}"} + ${optionalString http2Support "--enable-http2 --with-nghttp2"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} ${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"} --docdir=$(doc)/share/doc diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 674557d74fc2..33801c8cd326 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --replace @shell@ "${stdenv.shell}" \ --replace @coreutils@ "${coreutils}/bin" \ --replace @findutils@ "${findutils}/bin" \ - --replace @nix@ "${nix}/bin" \ + --replace @nix@ "${nix.out}/bin" \ --replace @xz@ "${xz.bin}/bin" \ --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --replace @shell@ "${stdenv.shell}" \ --replace @coreutils@ "${coreutils}/bin" \ --replace @findutils@ "${findutils}/bin" \ - --replace @nix@ "${nix}/bin" \ + --replace @nix@ "${nix.out}/bin" \ --replace @xz@ "${xz.bin}/bin" \ --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ |