From 9a38c3a11b8db6c20611e536236d3b4831ef4498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 18 Nov 2020 08:38:23 +0100 Subject: [PATCH] knot-resolver: fix evaluation on darwin I somehow forgot that libcap_ng is linux-only. I'm missing ofborg's darwin builder, but I might've tested evaluation at least... --- pkgs/servers/dns/knot-resolver/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index f88772bda0bc..2ec9a6dfdd90 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -2,8 +2,8 @@ # native deps. , runCommand, pkgconfig, meson, ninja, makeWrapper # build+runtime deps. -, knot-dns, luajitPackages, libuv, gnutls, lmdb, systemd, dns-root-data -, nghttp2, libcap_ng # optionals, in principle +, knot-dns, luajitPackages, libuv, gnutls, lmdb +, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle # test-only deps. , cmocka, which, cacert , extraFeatures ? false /* catch-all if defaults aren't enough */ @@ -54,9 +54,9 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] - ++ optional stdenv.isLinux systemd # passing sockets, sd_notify - ++ [ nghttp2 libcap_ng ] - ## optional dependencies; TODO: libedit, dnstap + ++ optionals stdenv.isLinux [ systemd libcap_ng ] + ++ [ nghttp2 ] + ## optional dependencies; TODO: dnstap ; mesonFlags = [