From 3deeecddadcdea71cfc5d114e6c9c239eb10ea3d Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 17 Jan 2018 09:52:50 -0800 Subject: [PATCH] squid, squid4: Allowing build on Darwin --- pkgs/servers/squid/4.nix | 7 ++++--- pkgs/servers/squid/default.nix | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix index 9f43af418e6..f0429475be2 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 2da0316483b..7f1c97bd642 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; {