From c89e5439a168cc2c93c11da7c01563695bba0d0b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 22 Aug 2019 15:31:32 +0200 Subject: [PATCH] squid: fix build with openssl 1.1 --- pkgs/servers/squid/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 69a46533ba5d..72a7fff7c475 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap -, expat, libxml2, openssl }: +, expat, libxml2, openssl, pkgconfig +}: stdenv.mkDerivation rec { name = "squid-4.8"; @@ -9,14 +10,11 @@ stdenv.mkDerivation rec { sha256 = "0432m0ix046rkja7r7qpydgsm2kf1w393xym15nx6h9kv4jb7kbq"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; - prePatch = '' - substituteInPlace configure --replace "/usr/local/include/libxml2" "${libxml2.dev}/include/libxml2" - ''; - configureFlags = [ "--enable-ipv6" "--disable-strict-error-checking"