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 <