BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #289979 from haraldh/unbound_pkg_config

Browse source
This commit is contained in:
Sandro 2024-03-11 14:11:08 +01:00 committed by GitHub
commit b4a23ce4a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/tools/networking/unbound/default.nix
View file

@ -58,10 +58,35 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-zFYNNFc0ImwbOecadpeX5/3eImXLt3685UJwS7pInlU=";
};
# Cherry pick some already merged upstream patches for configure
patches = [
# Search for protobuf-c with pkg-config
# https://github.com/NLnetLabs/unbound/pull/999
(fetchpatch {
url = "https://github.com/NLnetLabs/unbound/commit/59d98b9ef64e597c331c27160715d7a1b40c8638.patch";
hash = "sha256-DvYoYBTXOwbR8Z0GRgt724WqX3dbIEOdICU2/VMRSVQ=";
})
# Fix for previous patch
# https://github.com/NLnetLabs/unbound/issues/1006
(fetchpatch {
url = "https://github.com/NLnetLabs/unbound/commit/93490a0fc1bf9e62e6edcd6b69f1463c7ac410e9.patch";
hash = "sha256-mBo63ZlayD3YkOgIoQN0dG+xuFq/BxcjBmSo1vapiYA=";
excludes = [ "doc/Changelog" ];
})
# Fix for previous patch
# https://github.com/NLnetLabs/unbound/commit/3f5175584b0bb9ff7d417bc195ec6e4316ae58d3
(fetchpatch {
url = "https://github.com/NLnetLabs/unbound/commit/3f5175584b0bb9ff7d417bc195ec6e4316ae58d3.patch";
hash = "sha256-DcWfvmk+4K3c9Z+4grwzEGIkEBYNpbTK3xuBqRI33fY=";
})
];
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
nativeBuildInputs =
lib.optionals withMakeWrapper [ makeWrapper ]
++ lib.optionals withDNSTAP [ protobufc ]
++ [ pkg-config ]
++ lib.optionals withPythonModule [ swig ];
@ -97,7 +122,6 @@ stdenv.mkDerivation (finalAttrs: {
"--with-libsodium=${symlinkJoin { name = "libsodium-full"; paths = [ libsodium.dev libsodium.out ]; }}"
] ++ lib.optionals withDNSTAP [
"--enable-dnstap"
"--with-protobuf-c=${protobufc}"
] ++ lib.optionals withTFO [
"--enable-tfo-client"
"--enable-tfo-server"