From b3ef62bca280fcf43084a034da1ba45fc941a0d9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 13 Apr 2020 12:49:48 +1000 Subject: [PATCH] Revert "gotools: fix darwin build" This reverts commit cb75c0f90536d8aa5e970c6f4bedf78d635fe188. Not needed now that Security is propagated via go https://github.com/NixOS/nixpkgs/commit/0bba7474b3e6c8cef36960614446447d38ec04c9 --- pkgs/development/tools/gotools/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index d46c9a9fb311..430f17bfb5b0 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, go, buildGoModule, fetchgit, Security }: +{ stdenv, go, buildGoModule, fetchgit }: buildGoModule rec { pname = "gotools-unstable"; @@ -11,8 +11,6 @@ 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 46e9dd3bee30..9a342f072804 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17160,9 +17160,7 @@ in go-tools = callPackage ../development/tools/go-tools { }; - gotools = callPackage ../development/tools/gotools { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gotools = callPackage ../development/tools/gotools { }; gotop = callPackage ../tools/system/gotop { };