diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-03-11 14:11:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-11 14:11:08 +0100 |
| commit | b4a23ce4a3115313e2727b7f09beb69b4c4ef9bf (patch) | |
| tree | 3af9588803e518cd704d30d22656396c1f939601 /pkgs | |
| parent | 339816cfdfd8949ed4b1abde6218198c70bfea8e (diff) | |
| parent | d29146c1f85f68c5037c4fd6de9e7836fa3173d7 (diff) | |
| download | nixlib-b4a23ce4a3115313e2727b7f09beb69b4c4ef9bf.tar nixlib-b4a23ce4a3115313e2727b7f09beb69b4c4ef9bf.tar.gz nixlib-b4a23ce4a3115313e2727b7f09beb69b4c4ef9bf.tar.bz2 nixlib-b4a23ce4a3115313e2727b7f09beb69b4c4ef9bf.tar.lz nixlib-b4a23ce4a3115313e2727b7f09beb69b4c4ef9bf.tar.xz nixlib-b4a23ce4a3115313e2727b7f09beb69b4c4ef9bf.tar.zst nixlib-b4a23ce4a3115313e2727b7f09beb69b4c4ef9bf.zip | |
Merge pull request #289979 from haraldh/unbound_pkg_config
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" |