diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2020-03-22 14:41:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 14:41:16 +0100 |
| commit | ce12576dd0ccbec911cc03d86da9728192c4ba84 (patch) | |
| tree | 993775080e96f2d9e6c303f14438aaea0fed60fc | |
| parent | 4e6bf03504c9e09f067cc6dee6b5aeec43a1405c (diff) | |
| parent | cb75c0f90536d8aa5e970c6f4bedf78d635fe188 (diff) | |
| download | nixlib-ce12576dd0ccbec911cc03d86da9728192c4ba84.tar nixlib-ce12576dd0ccbec911cc03d86da9728192c4ba84.tar.gz nixlib-ce12576dd0ccbec911cc03d86da9728192c4ba84.tar.bz2 nixlib-ce12576dd0ccbec911cc03d86da9728192c4ba84.tar.lz nixlib-ce12576dd0ccbec911cc03d86da9728192c4ba84.tar.xz nixlib-ce12576dd0ccbec911cc03d86da9728192c4ba84.tar.zst nixlib-ce12576dd0ccbec911cc03d86da9728192c4ba84.zip | |
Merge pull request #83079 from LnL7/darwin-gotools
gotools: fix darwin build
| -rw-r--r-- | pkgs/development/tools/gotools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 430f17bfb5b0..d46c9a9fb311 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, go, buildGoModule, fetchgit }: +{ stdenv, go, buildGoModule, fetchgit, Security }: buildGoModule rec { pname = "gotools-unstable"; @@ -11,6 +11,8 @@ buildGoModule rec { sha256 = "16m62m303j4wqfjr1401xpqpb9m11bs6qc2dhf6x2za2d9pycish"; }; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + # 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 # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 787c227604cd..3d259a3b023e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17296,7 +17296,9 @@ in 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 { }; |