From dacbca273007fad83a22fc51b33b2350ed7094c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Jan 2017 12:53:24 +0100 Subject: [PATCH] knot-dns: yet another attempt to fix build on Darwin --- pkgs/servers/dns/knot-dns/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 834d9a09b5bb..c7b2032a5790 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn -, systemd, nettle, libedit, zlib, libiconv +, systemd, nettle, libedit, zlib, libiconv, fetchpatch }: # Note: ATM only the libraries have been tested in nixpkgs. @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b"; }; + patches = stdenv.lib.optional stdenv.isDarwin + (fetchpatch { + name = "before-sierra.diff"; + url = "https://gitlab.labs.nic.cz/labs/knot/merge_requests/664.diff"; + sha256 = "0g4gm2m3pi0lfpkp53xayf6jq6yn3ifidh40maiy1a46dfadvw6w"; + }); + outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; @@ -27,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - CFLAGS = [ "-DNDEBUG" ]; + CFLAGS = [ "-O2" "-DNDEBUG" ]; #doCheck = true; problems in combination with dynamic linking