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 af9b5e558b00..d9242a886a32 100644 --- a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix @@ -1,12 +1,15 @@ { knot-resolver_6, - writeText, python3Packages, + extraFeatures ? false, }: - +let + knot-resolver = knot-resolver_6.override { inherit extraFeatures; }; +in python3Packages.buildPythonPackage { pname = "knot-resolver-manager_6"; - inherit (knot-resolver_6) version src; + inherit (knot-resolver) version; + inherit (knot-resolver.unwrapped) src; pyproject = true; patches = [ @@ -19,8 +22,9 @@ python3Packages.buildPythonPackage { # Propagate meson config from the C part to the python part. # But the install-time etc differs from a sensible run-time etc. postPatch = '' - substitute '${knot-resolver_6.config_py}'/knot_resolver/constants.py ./python/knot_resolver/constants.py \ - --replace-fail '${knot-resolver_6.out}/etc' '/etc' + 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' ''; build-system = with python3Packages; [ @@ -67,7 +71,7 @@ python3Packages.buildPythonPackage { "test_proxy_rehandshake_tls12" ]; - meta = knot-resolver_6.meta // { + meta = knot-resolver.meta // { mainProgram = "knot-resolver"; }; } diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix index 66d2136249ea..87b735049c04 100644 --- a/pkgs/by-name/kn/knot-resolver_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver_6/package.nix @@ -136,6 +136,10 @@ let meson test --print-errorlogs --no-suite snowflake ''; + passthru = { + unwrapped = finalAttrs.finalPackage; + }; + meta = with lib; { description = "Caching validating DNS resolver, from .cz domain registry"; homepage = "https://knot-resolver.cz"; @@ -162,7 +166,10 @@ let ]; preferLocalBuild = true; allowSubstitutes = false; - inherit (unwrapped) meta; + inherit (unwrapped) version meta; + passthru = { + inherit unwrapped; + }; } ( ''