summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorWael Nasreddine <wael.nasreddine@gmail.com>2019-03-21 14:44:03 -0700
committerGitHub <noreply@github.com>2019-03-21 14:44:03 -0700
commit6d7d69ff3e4d107201e75576431bf06cdf463a8e (patch)
tree1275f7df49de17f0fdcc0b9f64c94c1555547a44 /pkgs/development
parent400b6032c858ba1e6089da3484539f345da56cd7 (diff)
downloadnixpkgs-6d7d69ff3e4d107201e75576431bf06cdf463a8e.tar
nixpkgs-6d7d69ff3e4d107201e75576431bf06cdf463a8e.tar.gz
nixpkgs-6d7d69ff3e4d107201e75576431bf06cdf463a8e.tar.bz2
nixpkgs-6d7d69ff3e4d107201e75576431bf06cdf463a8e.tar.lz
nixpkgs-6d7d69ff3e4d107201e75576431bf06cdf463a8e.tar.xz
nixpkgs-6d7d69ff3e4d107201e75576431bf06cdf463a8e.tar.zst
nixpkgs-6d7d69ff3e4d107201e75576431bf06cdf463a8e.zip
buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071)
cacert already exposes NIX_SSL_CERT_FILE in its setupHook. Fetchers and builders are already setup to use this variable and there's no need to export them manually.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/go-modules/generic/default.nix12
1 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index b7fdfe61570..fed0234b46c 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -36,7 +36,7 @@ let
   go-modules = go.stdenv.mkDerivation {
     name = "${name}-go-modules";
 
-    nativeBuildInputs = [ go git ];
+    nativeBuildInputs = [ go git cacert ];
 
     inherit (args) src;
     inherit (go) GOOS GOARCH;
@@ -45,16 +45,6 @@ let
 
     GO111MODULE = "on";
 
-    # XXX: Add support for other fetchers, such as hg, bzr and alike.
-    GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-
-    # Instruct Go where to find the cacert.
-    # SSL_CERT_FILE is used by Linux machines.
-    # NIX_SSL_CERT_FILE is used by Darwin machines based on
-    # pkgs/development/compilers/go/ssl-cert-file-1.9.patch.
-    NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-
     impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
       "GIT_PROXY_COMMAND" "SOCKS_SERVER"
     ];