From ae17a85324be66255a27c16b4f9b2d2a225c5d89 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 8 Nov 2020 04:20:00 +0000 Subject: [PATCH 1/2] dogdns: fix build on darwin --- pkgs/tools/networking/dogdns/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index 2875f202515..0389d733599 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -3,6 +3,7 @@ , rustPlatform , pkg-config , openssl +, Security }: rustPlatform.buildRustPackage rec { @@ -16,8 +17,9 @@ rustPlatform.buildRustPackage rec { sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f881a85cca..dec61706713 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3355,7 +3355,9 @@ in dog = callPackage ../tools/system/dog { }; - dogdns = callPackage ../tools/networking/dogdns { }; + dogdns = callPackage ../tools/networking/dogdns { + inherit (darwin.apple_sdk.frameworks) Security; + }; dosfstools = callPackage ../tools/filesystems/dosfstools { }; From f4e11121fe4f6664c78b15f0891b96fb059a5b1b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 8 Nov 2020 04:20:00 +0000 Subject: [PATCH 2/2] dogdns: install completions --- pkgs/tools/networking/dogdns/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index 0389d733599..71e065e5d14 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -4,6 +4,7 @@ , pkg-config , openssl , Security +, installShellFiles }: rustPlatform.buildRustPackage rec { @@ -17,12 +18,17 @@ rustPlatform.buildRustPackage rec { sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy"; }; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ installShellFiles ] + ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6"; + postInstall = '' + installShellCompletion completions/dog.{bash,fish,zsh} + ''; + meta = with stdenv.lib; { description = "Command-line DNS client"; homepage = "https://dns.lookup.dog";