b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

serf: patch for openssl_3

Browse source 
also affects subversion
This commit is contained in:
ajs124 2023-04-28 14:21:16 +02:00
parent 3b2220d448
commit 4f1ba7a970
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/libraries/serf/default.nix
View file

@ -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=";

6
pkgs/top-level/all-packages.nix
View file

@ -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;