diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index d47b5a3e6a3..1ec5a78ea1a 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26e8d7120e6..4dc3708603e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };