From f27fb8ab758aef15115f5651ee92fd9ebef7e8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 25 Jan 2017 22:41:07 +0100
Subject: [PATCH] knot-{dns,resolver}: try to fix on darwin

Evaluation works now, at least.
---
 pkgs/servers/dns/knot-dns/default.nix      |  7 ++++---
 pkgs/servers/dns/knot-resolver/default.nix | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 9ecd6fe0b9d5..07ba9cef82fb 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -15,10 +15,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gnutls jansson liburcu lmdb libcap_ng libidn
-    systemd nettle libedit
+    gnutls jansson liburcu lmdb libidn
+    nettle libedit
     # without sphinx &al. for developer documentation
-  ];
+  ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 493a4a17e4d9..3c84d0942e76 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -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
 , gnutls, nettle
 , luajitPackages, makeWrapper
@@ -20,15 +21,16 @@ stdenv.mkDerivation rec {
 
   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 ]
     # TODO: lmdb needs lmdb.pc; embedded for now
     ## optional dependencies
     ++ optional doInstallCheck cmocka
+    ++ optional stdenv.isLinux systemd # socket activation
     ++ [
       nettle # DNS cookies
-      systemd # socket activation
-      makeWrapper
       hiredis libmemcached # additional cache backends
       # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
     ];