diff --git a/pkgs/development/libraries/neon/0.26.nix b/pkgs/development/libraries/neon/0.26.nix index c6dde2253bc..6b06e54e73d 100644 --- a/pkgs/development/libraries/neon/0.26.nix +++ b/pkgs/development/libraries/neon/0.26.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2 +{ stdenv, fetchurl, libxml2, pkgconfig , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null }: @@ -14,11 +14,13 @@ stdenv.mkDerivation { sha256 = "1pjrn5wb18gy419293hmwd02blmh36aaxsrgajm9nkkkjzqakncj"; }; - buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib; + buildInputs = [libxml2] + ++ stdenv.lib.optional compressionSupport zlib + ++ (if sslSupport then [ openssl pkgconfig ] else []); configureFlags = '' ${if compressionSupport then "--with-zlib" else "--without-zlib"} - ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"} + ${if sslSupport then "--with-ssl" else "--without-ssl"} --enable-shared ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41fadf1fc1d..11f70630778 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4717,7 +4717,7 @@ let neon = neon026; neon026 = import ../development/libraries/neon/0.26.nix { - inherit fetchurl stdenv libxml2 zlib openssl; + inherit fetchurl stdenv libxml2 zlib openssl pkgconfig; compressionSupport = true; sslSupport = true; };