swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-20 12:43:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #83079 from LnL7/darwin-gotools

Browse source 
gotools: fix darwin build
This commit is contained in:
Daiderd Jordan 2020-03-22 14:41:16 +01:00 committed by GitHub
parent 4e6bf03504 cb75c0f905
commit ce12576dd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 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 }: { stdenv, go, buildGoModule, fetchgit, Security }:
buildGoModule rec { buildGoModule rec {
pname = "gotools-unstable"; pname = "gotools-unstable";
@ -11,6 +11,8 @@ 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

@ -17296,7 +17296,9 @@ in
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
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 { };