diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-06-23 09:05:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-23 09:05:44 +0800 |
| commit | 3612945be80f916cde80537433ec0a4a0e6b3d3b (patch) | |
| tree | 4807e17a436952e750962aaf722b31fca445dc16 | |
| parent | Merge #238445: staging-next-22.11 - iteration 10 (diff) | |
| parent | knot-resolver: respect doInstallCheck even in wrapper (diff) | |
| download | nixpkgs-3612945be80f916cde80537433ec0a4a0e6b3d3b.tar.gz | |
Merge pull request #239164 from NixOS/backport-239024-to-release-22.11
[Backport release-22.11] knot-resolver: respect doInstallCheck even in wrapper
| -rw-r--r-- | pkgs/servers/dns/knot-resolver/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 184db46830b1..4cafe101ed55 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -116,7 +116,7 @@ wrapped-full = runCommand unwrapped.name allowSubstitutes = false; inherit (unwrapped) meta; } - '' + ('' mkdir -p "$out"/bin makeWrapper '${unwrapped}/bin/kresd' "$out"/bin/kresd \ --set LUA_PATH "$LUA_PATH" \ @@ -125,10 +125,10 @@ wrapped-full = runCommand unwrapped.name ln -sr '${unwrapped}/share' "$out"/ ln -sr '${unwrapped}/lib' "$out"/ # useful in NixOS service ln -sr "$out"/{bin,sbin} - + '' + lib.optionalString unwrapped.doInstallCheck '' echo "Checking that 'http' module loads, i.e. lua search paths work:" echo "modules.load('http')" > test-http.lua echo -e 'quit()' | env -i "$out"/bin/kresd -a 127.0.0.1#53535 -c test-http.lua - ''; + ''); in result |