diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-30 20:07:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-30 20:08:16 +0100 |
| commit | 612333a7703e22df98dd6b3d9cd99bdeaac4f808 (patch) | |
| tree | 4941e36b4f2416cf0e9e65e25ad60e2e5a2e6c38 | |
| parent | 49b136377a93391f8fb2c80b9d14852dd531bb6c (diff) | |
| download | nixpkgs-612333a7703e22df98dd6b3d9cd99bdeaac4f808.tar nixpkgs-612333a7703e22df98dd6b3d9cd99bdeaac4f808.tar.gz nixpkgs-612333a7703e22df98dd6b3d9cd99bdeaac4f808.tar.bz2 nixpkgs-612333a7703e22df98dd6b3d9cd99bdeaac4f808.tar.lz nixpkgs-612333a7703e22df98dd6b3d9cd99bdeaac4f808.tar.xz nixpkgs-612333a7703e22df98dd6b3d9cd99bdeaac4f808.tar.zst nixpkgs-612333a7703e22df98dd6b3d9cd99bdeaac4f808.zip | |
knot-resolver: yet another attempt to fix build on Darwin
| -rw-r--r-- | pkgs/servers/dns/knot-resolver/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 3c84d0942e7..1e7dbaf8e2f 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af1a6220ecf..cb76372b097 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |