public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82916 from marsam/fix-gh-darwin

Browse Source 
gitAndTools.gh: fix build on darwin
This commit is contained in:
Mario Rodas 2020-03-19 00:06:00 -05:00 committed by GitHub
commit 313706328d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -30,7 +30,9 @@ let
diff-so-fancy = callPackage ./diff-so-fancy { }; diff-so-fancy = callPackage ./diff-so-fancy { };
gh = callPackage ./gh { }; gh = callPackage ./gh {
inherit (darwin.apple_sdk.frameworks) Security;
};
ghq = callPackage ./ghq { }; ghq = callPackage ./ghq { };

5
pkgs/applications/version-management/git-and-tools/gh/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: { stdenv, fetchFromGitHub, buildGoModule, installShellFiles, Security }:
buildGoModule rec { buildGoModule rec {
pname = "gh"; pname = "gh";
@ -20,6 +20,7 @@ buildGoModule rec {
subPackages = [ "cmd/gh" ]; subPackages = [ "cmd/gh" ];
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
postInstall = '' postInstall = ''
for shell in bash fish zsh; do for shell in bash fish zsh; do
$out/bin/gh completion -s $shell > gh.$shell $out/bin/gh completion -s $shell > gh.$shell
@ -27,7 +28,7 @@ buildGoModule rec {
done done
''; '';
meta = with lib; { meta = with stdenv.lib; {
description = "GitHub CLI tool"; description = "GitHub CLI tool";
homepage = "https://cli.github.com/"; homepage = "https://cli.github.com/";
license = licenses.mit; license = licenses.mit;