alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge #170909: knot-resolver: minor improvements

Browse source
This commit is contained in:
Vladimír Čunát 2022-05-06 16:27:57 +02:00
parent 46e402fc6e 9791289e84
commit c84e5f8e1f
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/servers/dns/knot-resolver/default.nix
View file

@ -55,7 +55,7 @@ unwrapped = stdenv.mkDerivation rec {
# http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
++ optionals stdenv.isLinux [ systemd libcap_ng ]
++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ]
++ [ nghttp2 ]
## optional dependencies; TODO: dnstap
;
@ -79,8 +79,7 @@ unwrapped = stdenv.mkDerivation rec {
rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
'';
doInstallCheck = with stdenv; hostPlatform == buildPlatform
&& !(isDarwin && isAarch64); # avoid luarocks, as it's broken ATM on the platform
doInstallCheck = with stdenv; hostPlatform == buildPlatform;
installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ];
installCheckPhase = ''
meson test --print-errorlogs

4
pkgs/top-level/all-packages.nix
View file

@ -21862,7 +21862,9 @@ with pkgs;
keycloak = callPackage ../servers/keycloak { };
knot-dns = callPackage ../servers/dns/knot-dns { };
knot-resolver = callPackage ../servers/dns/knot-resolver { };
knot-resolver = callPackage ../servers/dns/knot-resolver {
systemd = systemdMinimal; # in closure already anyway
};
rdkafka = callPackage ../development/libraries/rdkafka { };