From 67bb1368ec0854635900d7f0b30895d8b1a0a910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 13 Dec 2025 10:52:46 +0100
Subject: [PATCH] knot-resolver*_6: simplify path overrides

---
 .../by-name/kn/knot-resolver-manager_6/package.nix |  1 -
 pkgs/by-name/kn/knot-resolver_6/package.nix        | 12 ++----------
 pkgs/by-name/kn/knot-resolver_6/paths.patch        | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/by-name/kn/knot-resolver_6/paths.patch

diff --git a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix
index c7c6f7d7f493..3d3b4c89d326 100644
--- a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix
+++ b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix
@@ -23,7 +23,6 @@ python3Packages.buildPythonPackage {
   # But the install-time etc differs from a sensible run-time etc.
   postPatch = ''
     substitute '${knot-resolver.unwrapped.config_py}'/knot_resolver/constants.py ./python/knot_resolver/constants.py \
-      --replace-fail '${knot-resolver.unwrapped.out}/etc' '/etc' \
       --replace-fail '${knot-resolver.unwrapped.out}/sbin' '${knot-resolver}/bin'
   ''
   # On non-Linux let's simplify construction of the knot-resolver command line,
diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix
index f961f28e4209..b49175965034 100644
--- a/pkgs/by-name/kn/knot-resolver_6/package.nix
+++ b/pkgs/by-name/kn/knot-resolver_6/package.nix
@@ -56,20 +56,12 @@ let
         excludes = [ "NEWS" ];
         hash = "sha256-3w33v8UfhGdA50BlkfHpQLFxg+5ELk0lp7RzgvkSzK8=";
       })
+      # Install-time paths sometimes differ from run-time paths in nixpkgs.
+      ./paths.patch
     ];
 
-    # Path fixups for the NixOS service.
     # systemd Exec* options are difficult to override in NixOS *if present*, so we drop them.
     postPatch = ''
-      patch meson.build <<EOF
-      @@ -50,2 +50,3 @@
-      -systemd_work_dir = prefix / get_option('localstatedir') / 'lib' / 'knot-resolver'
-      -systemd_cache_dir = prefix / get_option('localstatedir') / 'cache' / 'knot-resolver'
-      +systemd_work_dir  = '/var/lib/knot-resolver'
-      +systemd_cache_dir = '/var/cache/knot-resolver'
-      +run_dir = '/run/knot-resolver'
-      EOF
-
       sed -e '/^ExecStart=/d' -e '/^ExecReload=/d' \
         -i systemd/knot-resolver.service.in
     ''
diff --git a/pkgs/by-name/kn/knot-resolver_6/paths.patch b/pkgs/by-name/kn/knot-resolver_6/paths.patch
new file mode 100644
index 000000000000..75d2fcea9c57
--- /dev/null
+++ b/pkgs/by-name/kn/knot-resolver_6/paths.patch
@@ -0,0 +1,14 @@
+--- a/meson.build
++++ b/meson.build
+@@ -50,2 +50,3 @@
+-systemd_work_dir = prefix / get_option('localstatedir') / 'lib' / 'knot-resolver'
+-systemd_cache_dir = prefix / get_option('localstatedir') / 'cache' / 'knot-resolver'
++systemd_work_dir  = '/var/lib/knot-resolver'
++systemd_cache_dir = '/var/cache/knot-resolver'
++run_dir = '/run/knot-resolver'
+
+--- a/python/knot_resolver/constants.py.in
++++ b/python/knot_resolver/constants.py.in
+@@ -12 +12 @@
+-ETC_DIR = Path("@etc_dir@")
++ETC_DIR = Path("/etc/knot-resolver")