diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-03-19 00:06:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 00:06:00 -0500 |
| commit | 313706328d3a1b1b7f187c00111afe0f31135709 (patch) | |
| tree | e4c3a7a5187216e5df0b00a7b2cda2ca322e1e24 | |
| parent | 9a7f11e361fcca841959f544cc9887767c47cbf7 (diff) | |
| parent | a51275f3b5f82fe3e45ff4536ee2994c9fc4029a (diff) | |
| download | nixlib-313706328d3a1b1b7f187c00111afe0f31135709.tar nixlib-313706328d3a1b1b7f187c00111afe0f31135709.tar.gz nixlib-313706328d3a1b1b7f187c00111afe0f31135709.tar.bz2 nixlib-313706328d3a1b1b7f187c00111afe0f31135709.tar.lz nixlib-313706328d3a1b1b7f187c00111afe0f31135709.tar.xz nixlib-313706328d3a1b1b7f187c00111afe0f31135709.tar.zst nixlib-313706328d3a1b1b7f187c00111afe0f31135709.zip | |
Merge pull request #82916 from marsam/fix-gh-darwin
gitAndTools.gh: fix build on darwin
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/gh/default.nix | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 8df8d96e6411..a4b3ac1a65aa 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -30,7 +30,9 @@ let diff-so-fancy = callPackage ./diff-so-fancy { }; - gh = callPackage ./gh { }; + gh = callPackage ./gh { + inherit (darwin.apple_sdk.frameworks) Security; + }; ghq = callPackage ./ghq { }; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index e74bd78fc59b..e655813d3403 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: +{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, Security }: buildGoModule rec { pname = "gh"; @@ -20,6 +20,7 @@ buildGoModule rec { subPackages = [ "cmd/gh" ]; nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' for shell in bash fish zsh; do $out/bin/gh completion -s $shell > gh.$shell @@ -27,7 +28,7 @@ buildGoModule rec { done ''; - meta = with lib; { + meta = with stdenv.lib; { description = "GitHub CLI tool"; homepage = "https://cli.github.com/"; license = licenses.mit; |