Merge pull request #103131 from marsam/fix-dogdns-darwin

dogdns: fix build on darwin
This commit is contained in:
Mario Rodas 2020-11-09 09:03:58 -05:00 committed by GitHub
commit 5fff64bc01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions

View File

@ -3,6 +3,8 @@
, rustPlatform , rustPlatform
, pkg-config , pkg-config
, openssl , openssl
, Security
, installShellFiles
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -16,11 +18,17 @@ rustPlatform.buildRustPackage rec {
sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy"; sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ installShellFiles ]
buildInputs = [ openssl ]; ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6"; cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6";
postInstall = ''
installShellCompletion completions/dog.{bash,fish,zsh}
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Command-line DNS client"; description = "Command-line DNS client";
homepage = "https://dns.lookup.dog"; homepage = "https://dns.lookup.dog";

View File

@ -3355,7 +3355,9 @@ in
dog = callPackage ../tools/system/dog { }; 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 { }; dosfstools = callPackage ../tools/filesystems/dosfstools { };