serf: patch for openssl_3
also affects subversion
This commit is contained in:
parent
3b2220d448
commit
4f1ba7a970
|
@ -1,5 +1,6 @@
|
||||||
{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5
|
{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5
|
||||||
, pkg-config, libiconv }:
|
, pkg-config, libiconv
|
||||||
|
, fetchpatch }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "serf";
|
pname = "serf";
|
||||||
|
@ -14,7 +15,18 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [ apr openssl aprutil zlib libiconv ]
|
buildInputs = [ apr openssl aprutil zlib libiconv ]
|
||||||
++ lib.optional (!stdenv.isCygwin) libkrb5;
|
++ 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=";
|
prefixKey = "PREFIX=";
|
||||||
|
|
||||||
|
|
|
@ -23647,10 +23647,7 @@ with pkgs;
|
||||||
|
|
||||||
serd = callPackage ../development/libraries/serd { };
|
serd = callPackage ../development/libraries/serd { };
|
||||||
|
|
||||||
serf = callPackage ../development/libraries/serf {
|
serf = callPackage ../development/libraries/serf { };
|
||||||
openssl = openssl_1_1;
|
|
||||||
aprutil = aprutil.override { openssl = openssl_1_1; };
|
|
||||||
};
|
|
||||||
|
|
||||||
sfsexp = callPackage ../development/libraries/sfsexp { };
|
sfsexp = callPackage ../development/libraries/sfsexp { };
|
||||||
|
|
||||||
|
@ -33964,7 +33961,6 @@ with pkgs;
|
||||||
sublime-merge-dev;
|
sublime-merge-dev;
|
||||||
|
|
||||||
inherit (callPackages ../applications/version-management/subversion {
|
inherit (callPackages ../applications/version-management/subversion {
|
||||||
openssl = openssl_1_1;
|
|
||||||
sasl = cyrus_sasl;
|
sasl = cyrus_sasl;
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||||
}) subversion;
|
}) subversion;
|
||||||
|
|
Loading…
Reference in a new issue