diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-10-26 11:30:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-26 11:30:24 +0200 |
| commit | 31db63bd745e0ec4c126c5affd4e63e3685c1581 (patch) | |
| tree | 08cc3be4265d3fef43799ce3b61bd3b2e6293ac4 | |
| parent | 69516040110334cfafa05a9355626a0bd8190d0d (diff) | |
| parent | 32d6259eec824f7422cc279f9791e6304ca31566 (diff) | |
| download | nixpkgs-31db63bd745e0ec4c126c5affd4e63e3685c1581.tar nixpkgs-31db63bd745e0ec4c126c5affd4e63e3685c1581.tar.gz nixpkgs-31db63bd745e0ec4c126c5affd4e63e3685c1581.tar.bz2 nixpkgs-31db63bd745e0ec4c126c5affd4e63e3685c1581.tar.lz nixpkgs-31db63bd745e0ec4c126c5affd4e63e3685c1581.tar.xz nixpkgs-31db63bd745e0ec4c126c5affd4e63e3685c1581.tar.zst nixpkgs-31db63bd745e0ec4c126c5affd4e63e3685c1581.zip | |
Merge pull request #30809 from andir/dnstracer-darwin
dnstracer: fix build on darwin
| -rw-r--r-- | pkgs/tools/networking/dnstracer/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index bb7c688480f..6d5e826c7d7 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libresolv }: stdenv.mkDerivation rec { version = "1.9"; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { setOutputFlags = false; + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ libresolv ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv"; + meta = with stdenv.lib; { description = "Dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data."; homepage = http://www.mavetju.org/unix/general.php; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89e59463bd..8579cd4a872 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19794,5 +19794,7 @@ with pkgs; duti = callPackage ../os-specific/darwin/duti {}; - dnstracer = callPackage ../tools/networking/dnstracer {}; + dnstracer = callPackage ../tools/networking/dnstracer { + inherit (darwin) libresolv; + }; } |