From 0c0832b6f801589cfcd9501bff40fff0c0eb28ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 21 Jun 2023 18:36:55 +0200 Subject: [PATCH] knot-resolver: respect doInstallCheck even in wrapper The main point is to avoid it when cross-compiling. (cherry picked from commit 962e2323a2d9e0d61b9c26e0a1fbef26028ebe1a) --- pkgs/servers/dns/knot-resolver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index ed64f6b791f4..d893c10d142b 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