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

knot-*: simplify lmdb dependency

Browse Source 
Partly thanks to lmdb.pc, partly thanks to 84bd2f4
(hopefully; untested on Darwin).
This commit is contained in:
Vladimír Čunát 2017-09-23 14:14:13 +02:00
parent dbf4d4ebb5
commit 7c7f8c9c1d
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,17 +20,13 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gnutls jansson liburcu libidn gnutls jansson liburcu libidn
nettle libedit nettle libedit
libiconv libiconv lmdb
# 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. ++ optionals stdenv.isLinux [ libcap_ng systemd ]
++ optionals stdenv.isLinux [ libcap_ng systemd lmdb ]
++ libintlOrEmpty ++ libintlOrEmpty
++ optional stdenv.isDarwin zlib; # perhaps due to gnutls ++ 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; enableParallelBuilding = true;
CFLAGS = [ "-O2" "-DNDEBUG" ]; CFLAGS = [ "-O2" "-DNDEBUG" ];

3
pkgs/servers/dns/knot-resolver/default.nix
View File

@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ]; nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];
# http://knot-resolver.readthedocs.io/en/latest/build.html#requirements # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
buildInputs = [ knot-dns luajit libuv gnutls nettle ] buildInputs = [ knot-dns luajit libuv gnutls nettle lmdb ]
++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin
++ optional doInstallCheck cmocka ++ optional doInstallCheck cmocka
++ optional stdenv.isLinux systemd # sd_notify ++ optional stdenv.isLinux systemd # sd_notify
++ optionals extraFeatures [ ++ optionals extraFeatures [