diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-23 14:14:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-23 14:15:56 +0200 |
| commit | 7c7f8c9c1d3d659e3b3fe51bfd6b4800ee944a35 (patch) | |
| tree | 022822ba4992d584d78f64f56cccd523fc764338 /pkgs/servers/dns | |
| parent | dbf4d4ebb5be8ae5e8943f5aa18bbeee4ba683d9 (diff) | |
| download | nixlib-7c7f8c9c1d3d659e3b3fe51bfd6b4800ee944a35.tar nixlib-7c7f8c9c1d3d659e3b3fe51bfd6b4800ee944a35.tar.gz nixlib-7c7f8c9c1d3d659e3b3fe51bfd6b4800ee944a35.tar.bz2 nixlib-7c7f8c9c1d3d659e3b3fe51bfd6b4800ee944a35.tar.lz nixlib-7c7f8c9c1d3d659e3b3fe51bfd6b4800ee944a35.tar.xz nixlib-7c7f8c9c1d3d659e3b3fe51bfd6b4800ee944a35.tar.zst nixlib-7c7f8c9c1d3d659e3b3fe51bfd6b4800ee944a35.zip | |
knot-*: simplify lmdb dependency
Partly thanks to lmdb.pc, partly thanks to 84bd2f4 (hopefully; untested on Darwin).
Diffstat (limited to 'pkgs/servers/dns')
| -rw-r--r-- | pkgs/servers/dns/knot-dns/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/dns/knot-resolver/default.nix | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 0b556a0859c8..1df36cd37c7b 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -20,17 +20,13 @@ stdenv.mkDerivation rec { buildInputs = [ gnutls jansson liburcu libidn nettle libedit - libiconv + libiconv lmdb # without sphinx &al. for developer documentation ] - # Use embedded lmdb there for now, as detection is broken on Darwin somehow. - ++ optionals stdenv.isLinux [ libcap_ng systemd lmdb ] + ++ optionals stdenv.isLinux [ libcap_ng systemd ] ++ libintlOrEmpty ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls - # Not ideal but seems to work on Linux. - configureFlags = optional stdenv.isLinux "--with-lmdb=${stdenv.lib.getLib lmdb}"; - enableParallelBuilding = true; CFLAGS = [ "-O2" "-DNDEBUG" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 6130550917e6..44c8b933400e 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -24,8 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ]; # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements - buildInputs = [ knot-dns luajit libuv gnutls nettle ] - ++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin + buildInputs = [ knot-dns luajit libuv gnutls nettle lmdb ] ++ optional doInstallCheck cmocka ++ optional stdenv.isLinux systemd # sd_notify ++ optionals extraFeatures [ |