about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2020-03-29 09:32:01 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2020-03-29 09:43:11 +1000
commit2ae5cf317f621265e6706f2764114d13d721ebfd (patch)
tree24c4d312722a60cb83f328877773cb436766d202 /pkgs/applications
parent596b601dfa8e8412fbc6db7748f6e4fb359a7731 (diff)
downloadnixlib-2ae5cf317f621265e6706f2764114d13d721ebfd.tar
nixlib-2ae5cf317f621265e6706f2764114d13d721ebfd.tar.gz
nixlib-2ae5cf317f621265e6706f2764114d13d721ebfd.tar.bz2
nixlib-2ae5cf317f621265e6706f2764114d13d721ebfd.tar.lz
nixlib-2ae5cf317f621265e6706f2764114d13d721ebfd.tar.xz
nixlib-2ae5cf317f621265e6706f2764114d13d721ebfd.tar.zst
nixlib-2ae5cf317f621265e6706f2764114d13d721ebfd.zip
Revert "gitAndTools.gh: fix build on darwin"
This reverts commit a51275f3b5f82fe3e45ff4536ee2994c9fc4029a.

Not needed now that Security is propagated via go in https://github.com/NixOS/nixpkgs/commit/0bba7474b3e6c8cef36960614446447d38ec04c9
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/gh/default.nix5
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a4b3ac1a65aa..8df8d96e6411 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -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 { };
 
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 e655813d3403..e74bd78fc59b 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 @@
-{ 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;