diff options
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/squid/4.nix | 7 | ||||
| -rw-r--r-- | pkgs/servers/squid/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix index 9f43af418e6e..f0429475be27 100644 --- a/pkgs/servers/squid/4.nix +++ b/pkgs/servers/squid/4.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - perl openldap pam db cyrus_sasl libcap expat libxml2 openssl - ]; + perl openldap db cyrus_sasl expat libxml2 openssl + ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; configureFlags = [ "--enable-ipv6" @@ -19,11 +19,12 @@ stdenv.mkDerivation rec { "--disable-arch-native" "--with-openssl" "--enable-ssl-crtd" - "--enable-linux-netfilter" "--enable-storeio=ufs,aufs,diskd,rock" "--enable-removal-policies=lru,heap" "--enable-delay-pools" "--enable-x-accelerator-vary" + ] ++ stdenv.lib.optionals stdenv.isLinux [ + "--enable-linux-netfilter" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 2da0316483b4..7f1c97bd642b 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - perl openldap pam db cyrus_sasl libcap expat libxml2 openssl - ]; + perl openldap db cyrus_sasl expat libxml2 openssl + ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; configureFlags = [ "--enable-ipv6" @@ -19,11 +19,12 @@ stdenv.mkDerivation rec { "--disable-arch-native" "--with-openssl" "--enable-ssl-crtd" - "--enable-linux-netfilter" "--enable-storeio=ufs,aufs,diskd,rock" "--enable-removal-policies=lru,heap" "--enable-delay-pools" "--enable-x-accelerator-vary" + ] ++ stdenv.lib.optionals stdenv.isLinux [ + "--enable-linux-netfilter" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ca1a773c4a28..f56d22d7b7ee 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -546,7 +546,7 @@ in "--with-sha1=CommonCrypto" ]; preConfigure = '' - ensureDir $out/Applications + mkdir -p $out/Applications export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices} ''; |