about summary refs log tree commit diff
path: root/pkgs/servers/dns/knot-dns/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/servers/dns/knot-dns/default.nix')
-rw-r--r--pkgs/servers/dns/knot-dns/default.nix18
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 07ba9cef82fb..af7d4d4c48ca 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,29 +1,35 @@
 { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
-, systemd, nettle, libedit }:
+, systemd, nettle, libedit, zlib, libiconv, fetchpatch
+}:
 
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b";
+    sha256 = "c064ddf99bf5fc24dd3c6a3a523394760357e204c8b69f0e691e49bc0d9b704c";
   };
 
   outputs = [ "bin" "out" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gnutls jansson liburcu lmdb libidn
+    gnutls jansson liburcu libidn lmdb
     nettle libedit
+    libiconv
     # without sphinx &al. for developer documentation
   ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ];
+    # Use embedded lmdb there for now, as detection is broken on Darwin somehow.
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ]
+    ++ stdenv.lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls
+
+  configureFlags = [ "--with-lmdb=${stdenv.lib.getLib lmdb}"/*not perfect*/ ];
 
   enableParallelBuilding = true;
 
-  CFLAGS = [ "-DNDEBUG" ];
+  CFLAGS = [ "-O2" "-DNDEBUG" ];
 
   #doCheck = true; problems in combination with dynamic linking