diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-11-09 09:03:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 09:03:58 -0500 |
| commit | 5fff64bc01dfbdf77cd6d995ccdd2a550087b7f4 (patch) | |
| tree | 1bde630ad9f70d42552d866b7333bc217c53d7c0 /pkgs | |
| parent | feeda77ec2b4c9589ee3c918d18c7b612df604c6 (diff) | |
| parent | f4e11121fe4f6664c78b15f0891b96fb059a5b1b (diff) | |
| download | nixpkgs-5fff64bc01dfbdf77cd6d995ccdd2a550087b7f4.tar nixpkgs-5fff64bc01dfbdf77cd6d995ccdd2a550087b7f4.tar.gz nixpkgs-5fff64bc01dfbdf77cd6d995ccdd2a550087b7f4.tar.bz2 nixpkgs-5fff64bc01dfbdf77cd6d995ccdd2a550087b7f4.tar.lz nixpkgs-5fff64bc01dfbdf77cd6d995ccdd2a550087b7f4.tar.xz nixpkgs-5fff64bc01dfbdf77cd6d995ccdd2a550087b7f4.tar.zst nixpkgs-5fff64bc01dfbdf77cd6d995ccdd2a550087b7f4.zip | |
Merge pull request #103131 from marsam/fix-dogdns-darwin
dogdns: fix build on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/dogdns/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index 2875f202515..71e065e5d14 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -3,6 +3,8 @@ , rustPlatform , pkg-config , openssl +, Security +, installShellFiles }: rustPlatform.buildRustPackage rec { @@ -16,11 +18,17 @@ rustPlatform.buildRustPackage rec { sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b5b1c9ddcc..8cb08bce062 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 { }; |