diff options
| author | Harald Hoyer <harald@hoyer.xyz> | 2024-02-19 12:56:45 +0100 |
|---|---|---|
| committer | Harald Hoyer <harald@hoyer.xyz> | 2024-03-11 12:09:03 +0100 |
| commit | d29146c1f85f68c5037c4fd6de9e7836fa3173d7 (patch) | |
| tree | 99c92059cb140d57c204a844ce1bfdb633aafcfe /pkgs | |
| parent | ce789e7e35e7cf72f5424f35d1b8b3ffcedd9226 (diff) | |
| download | nixlib-d29146c1f85f68c5037c4fd6de9e7836fa3173d7.tar nixlib-d29146c1f85f68c5037c4fd6de9e7836fa3173d7.tar.gz nixlib-d29146c1f85f68c5037c4fd6de9e7836fa3173d7.tar.bz2 nixlib-d29146c1f85f68c5037c4fd6de9e7836fa3173d7.tar.lz nixlib-d29146c1f85f68c5037c4fd6de9e7836fa3173d7.tar.xz nixlib-d29146c1f85f68c5037c4fd6de9e7836fa3173d7.tar.zst nixlib-d29146c1f85f68c5037c4fd6de9e7836fa3173d7.zip | |
unbound: 1.19.2 pkg-config for protobuf-c
Patched configure script with: https://github.com/NLnetLabs/unbound/commit/59d98b9ef64e597c331c27160715d7a1b40c8638 Credits: @NickCao and followup patches fixing the patch. Enables multiple outputs for protobuf-c Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/unbound/default.nix | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 68ff15b3c4ff..617f5f03f1c3 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -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" |