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

Revert "gotools: fix darwin build"

Browse Source 
This reverts commit cb75c0f90536d8aa5e970c6f4bedf78d635fe188.

Not needed now that Security is propagated via go 0bba7474b3
This commit is contained in:
zowoq 2020-04-13 12:49:48 +10:00
parent 3b5cb39081
commit b3ef62bca2
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/gotools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, go, buildGoModule, fetchgit, Security }: { stdenv, go, buildGoModule, fetchgit }:
buildGoModule rec { buildGoModule rec {
pname = "gotools-unstable"; pname = "gotools-unstable";
@ -11,8 +11,6 @@ buildGoModule rec {
sha256 = "16m62m303j4wqfjr1401xpqpb9m11bs6qc2dhf6x2za2d9pycish"; sha256 = "16m62m303j4wqfjr1401xpqpb9m11bs6qc2dhf6x2za2d9pycish";
}; };
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
# Build of golang.org/x/tools/gopls fails with: # Build of golang.org/x/tools/gopls fails with:
# can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls # can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls
# That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module.

4
pkgs/top-level/all-packages.nix
View File

@ -17160,9 +17160,7 @@ in
go-tools = callPackage ../development/tools/go-tools { }; go-tools = callPackage ../development/tools/go-tools { };
gotools = callPackage ../development/tools/gotools { gotools = callPackage ../development/tools/gotools { };
inherit (darwin.apple_sdk.frameworks) Security;
};
gotop = callPackage ../tools/system/gotop { }; gotop = callPackage ../tools/system/gotop { };