knot-{dns,resolver}: try to fix on darwin

Evaluation works now, at least.
This commit is contained in:
Vladimír Čunát 2017-01-25 22:41:07 +01:00
parent ed83ec1b65
commit f27fb8ab75
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 10 additions and 7 deletions
pkgs/servers/dns
knot-dns
knot-resolver

View File

@ -15,10 +15,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
gnutls jansson liburcu lmdb libcap_ng libidn gnutls jansson liburcu lmdb libidn
systemd nettle libedit nettle libedit
# without sphinx &al. for developer documentation # without sphinx &al. for developer documentation
]; ]
++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ];
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, utillinux, which, knot-dns, luajit, libuv, lmdb { stdenv, fetchurl, pkgconfig, utillinux, vimNox, which
, knot-dns, luajit, libuv, lmdb
, cmocka, systemd, hiredis, libmemcached , cmocka, systemd, hiredis, libmemcached
, gnutls, nettle , gnutls, nettle
, luajitPackages, makeWrapper , luajitPackages, makeWrapper
@ -20,15 +21,16 @@ stdenv.mkDerivation rec {
configurePhase = ":"; configurePhase = ":";
nativeBuildInputs = [ pkgconfig utillinux.bin/*hexdump*/ which ]; nativeBuildInputs = [ pkgconfig which makeWrapper ]
++ [(if stdenv.isLinux then utillinux.bin/*hexdump*/ else vimNox/*xxd*/)];
buildInputs = [ knot-dns luajit libuv gnutls ] buildInputs = [ knot-dns luajit libuv gnutls ]
# TODO: lmdb needs lmdb.pc; embedded for now # TODO: lmdb needs lmdb.pc; embedded for now
## optional dependencies ## optional dependencies
++ optional doInstallCheck cmocka ++ optional doInstallCheck cmocka
++ optional stdenv.isLinux systemd # socket activation
++ [ ++ [
nettle # DNS cookies nettle # DNS cookies
systemd # socket activation
makeWrapper
hiredis libmemcached # additional cache backends hiredis libmemcached # additional cache backends
# http://knot-resolver.readthedocs.io/en/latest/build.html#requirements # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
]; ];