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

knot-resolver: yet another attempt to fix build on Darwin

Browse Source
This commit is contained in:
Vladimír Čunát 2017-01-30 20:07:44 +01:00
parent 49b136377a
commit 612333a770
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, utillinux, vimNox, which
{ stdenv, fetchurl, pkgconfig, utillinux, hexdump, which
, knot-dns, luajit, libuv, lmdb
, cmocka, systemd, hiredis, libmemcached
, gnutls, nettle
@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
configurePhase = ":";
nativeBuildInputs = [ pkgconfig which makeWrapper ]
++ [(if stdenv.isLinux then utillinux.bin/*hexdump*/ else vimNox/*xxd*/)];
nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];
buildInputs = [ knot-dns luajit libuv gnutls ]
# TODO: lmdb needs lmdb.pc; embedded for now

5
pkgs/top-level/all-packages.nix
View File

@ -10321,7 +10321,10 @@ with pkgs;
jetty = callPackage ../servers/http/jetty { };
knot-dns = callPackage ../servers/dns/knot-dns { };
knot-resolver = callPackage ../servers/dns/knot-resolver { };
knot-resolver = callPackage ../servers/dns/knot-resolver {
# TODO: vimNox after it gets fixed on Darwin or something lighter
hexdump = if stdenv.isLinux then utillinux.bin else vim/*xxd*/;
};
rdkafka = callPackage ../development/libraries/rdkafka { };