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

knot-dns: fixup Darwin build again, hopefully

Browse Source
This commit is contained in:
Vladimír Čunát 2017-02-14 00:47:01 +01:00
parent 0ec9e695c8
commit 2fce8dda39
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/servers/dns/knot-dns/default.nix
View File

@ -2,6 +2,8 @@
, systemd, nettle, libedit, zlib, libiconv, fetchpatch , systemd, nettle, libedit, zlib, libiconv, fetchpatch
}: }:
with { inherit (stdenv.lib) optional optionals; };
# Note: ATM only the libraries have been tested in nixpkgs. # Note: ATM only the libraries have been tested in nixpkgs.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "knot-dns-${version}"; name = "knot-dns-${version}";
@ -16,16 +18,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
gnutls jansson liburcu libidn lmdb gnutls jansson liburcu libidn
nettle libedit nettle libedit
libiconv libiconv
# without sphinx &al. for developer documentation # without sphinx &al. for developer documentation
] ]
# Use embedded lmdb there for now, as detection is broken on Darwin somehow. # Use embedded lmdb there for now, as detection is broken on Darwin somehow.
++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ] ++ optionals stdenv.isLinux [ libcap_ng systemd lmdb ]
++ stdenv.lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls
configureFlags = [ "--with-lmdb=${stdenv.lib.getLib lmdb}"/*not perfect*/ ]; # Not ideal but seems to work on Linux.
configureFlags = optional stdenv.isLinux "--with-lmdb=${stdenv.lib.getLib lmdb}";
enableParallelBuilding = true; enableParallelBuilding = true;