diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-06-21 18:36:55 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-06-21 18:37:28 +0200 |
| commit | 962e2323a2d9e0d61b9c26e0a1fbef26028ebe1a (patch) | |
| tree | 60d67c1bc3eb14e7f6fd24d976d9535b35076f39 | |
| parent | 481fc5c7e1bc06b2a47d49f525ae938d89a5d6a5 (diff) | |
| download | nixpkgs-962e2323a2d9e0d61b9c26e0a1fbef26028ebe1a.tar nixpkgs-962e2323a2d9e0d61b9c26e0a1fbef26028ebe1a.tar.gz nixpkgs-962e2323a2d9e0d61b9c26e0a1fbef26028ebe1a.tar.bz2 nixpkgs-962e2323a2d9e0d61b9c26e0a1fbef26028ebe1a.tar.lz nixpkgs-962e2323a2d9e0d61b9c26e0a1fbef26028ebe1a.tar.xz nixpkgs-962e2323a2d9e0d61b9c26e0a1fbef26028ebe1a.tar.zst nixpkgs-962e2323a2d9e0d61b9c26e0a1fbef26028ebe1a.zip | |
knot-resolver: respect doInstallCheck even in wrapper
The main point is to avoid it when cross-compiling.
| -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 ed64f6b791f..d893c10d142 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 |