Skip to content

Commit

Permalink
knot-resolver: respect doInstallCheck even in wrapper
Browse files Browse the repository at this point in the history
The main point is to avoid it when cross-compiling.

(cherry picked from commit 962e232)
  • Loading branch information
vcunat authored and github-actions[bot] committed Jun 22, 2023
1 parent 3824588 commit 0c0832b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/servers/dns/knot-resolver/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand All @@ -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

0 comments on commit 0c0832b

Please sign in to comment.