diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 4f00e057e3c..2d46e6f5e0e 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5 -, pkg-config, libiconv }: +, pkg-config, libiconv +, fetchpatch }: stdenv.mkDerivation rec { pname = "serf"; @@ -14,7 +15,18 @@ stdenv.mkDerivation rec { buildInputs = [ apr openssl aprutil zlib libiconv ] ++ lib.optional (!stdenv.isCygwin) libkrb5; - patches = [ ./scons.patch ]; + patches = [ + ./scons.patch + # https://issues.apache.org/jira/projects/SERF/issues/SERF-198 + (fetchpatch { + url = "https://issues.apache.org/jira/secure/attachment/13019945/serf.patch"; + hash = "sha256-3djDGG30R/gq74KJL8OJ/upMh1zDpqtwGylRzN0lXpY="; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch"; + hash = "sha256-FQJvXOIZ0iItvbbcu4kR88j74M7fOi7C/0NN3o1/ub4="; + }) + ]; prefixKey = "PREFIX="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24f27bea1bc..6bb3b698e28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23647,10 +23647,7 @@ with pkgs; serd = callPackage ../development/libraries/serd { }; - serf = callPackage ../development/libraries/serf { - openssl = openssl_1_1; - aprutil = aprutil.override { openssl = openssl_1_1; }; - }; + serf = callPackage ../development/libraries/serf { }; sfsexp = callPackage ../development/libraries/sfsexp { }; @@ -33964,7 +33961,6 @@ with pkgs; sublime-merge-dev; inherit (callPackages ../applications/version-management/subversion { - openssl = openssl_1_1; sasl = cyrus_sasl; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }) subversion;