public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

knot-resolver: fix evaluation on darwin

Browse Source 
I somehow forgot that libcap_ng is linux-only.  I'm missing ofborg's
darwin builder, but I might've tested evaluation at least...
This commit is contained in:
Vladimír Čunát 2020-11-18 08:38:23 +01:00
parent 47b02b30e3
commit 9a38c3a11b
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/dns/knot-resolver/default.nix
View File

@ -2,8 +2,8 @@
# native deps. # native deps.
, runCommand, pkgconfig, meson, ninja, makeWrapper , runCommand, pkgconfig, meson, ninja, makeWrapper
# build+runtime deps. # build+runtime deps.
, knot-dns, luajitPackages, libuv, gnutls, lmdb, systemd, dns-root-data , knot-dns, luajitPackages, libuv, gnutls, lmdb
, nghttp2, libcap_ng # optionals, in principle , systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle
# test-only deps. # test-only deps.
, cmocka, which, cacert , cmocka, which, cacert
, extraFeatures ? false /* catch-all if defaults aren't enough */ , 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 # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
++ optional stdenv.isLinux systemd # passing sockets, sd_notify ++ optionals stdenv.isLinux [ systemd libcap_ng ]
++ [ nghttp2 libcap_ng ] ++ [ nghttp2 ]
## optional dependencies; TODO: libedit, dnstap ## optional dependencies; TODO: dnstap
; ;
mesonFlags = [ mesonFlags = [