summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2021-12-09 20:32:31 +0100
committerVladimír Čunát <v@cunat.cz>2021-12-09 20:32:55 +0100
commit0b0a1bdee041f9de41913e3f6e096ff135ae08cd (patch)
treede194c22cef33000bf6d9f9b48f5de72e5ac9843
parentMerge pull request #149890 from NixOS/backport-149658-to-release-21.11 (diff)
parentknot-resolver: patch a possibly unpleasant issue (diff)
downloadnixpkgs-0b0a1bdee041f9de41913e3f6e096ff135ae08cd.tar.gz
Merge #149903: knot-resolver: patch an issue
-rw-r--r--pkgs/servers/dns/knot-resolver/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 420b09234547..0019215cee6a 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl
+{ lib, stdenv, fetchurl, fetchpatch
# native deps.
, runCommand, pkg-config, meson, ninja, makeWrapper
# build+runtime deps.
@@ -26,6 +26,14 @@ unwrapped = stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
+ patches = [
+ (fetchpatch { # https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1237
+ name = "console.aws.amazon.com-fix.patch";
+ url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/f4dabfbec9273703.diff";
+ sha256 = "3J+FDwNQ6CqIGo9pSzhrQZlHX99vXFDpPOBpwpCnOxs=";
+ })
+ ];
+
# Path fixups for the NixOS service.
postPatch = ''
patch meson.build <<EOF