BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #83632 from zowoq/gh-darwin

Browse source 
Revert "gitAndTools.gh: fix build on darwin"
This commit is contained in:
Jörg Thalheim 2020-03-29 06:41:18 +01:00 committed by GitHub
commit 30c17b640f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 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,9 +30,7 @@ let
diff-so-fancy = callPackage ./diff-so-fancy { };
gh = callPackage ./gh {
inherit (darwin.apple_sdk.frameworks) Security;
};
gh = callPackage ./gh { };
ghq = callPackage ./ghq { };

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, Security }:
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
buildGoModule rec {
pname = "gh";
@ -20,7 +20,6 @@ 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
@ -28,7 +27,7 @@ buildGoModule rec {
done
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "GitHub CLI tool";
homepage = "https://cli.github.com/";
license = licenses.mit;