diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
| commit | 439ebf093f2779d73bc76484a36be2889cc807bf (patch) | |
| tree | 7dd3b84fb345c228165c2dae6c7cdd54b433db9e /nixpkgs/pkgs/development/go-modules/generic/default.nix | |
| parent | d7417c2c1096b13fe903af802c7cf019fca14a7b (diff) | |
| parent | 0c0954781e257b8b0dc49341795a2fe7d96945a3 (diff) | |
| download | nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.gz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.bz2 nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.lz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.xz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.zst nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.zip | |
Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'
Diffstat (limited to 'nixpkgs/pkgs/development/go-modules/generic/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/go-modules/generic/default.nix | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/go-modules/generic/default.nix b/nixpkgs/pkgs/development/go-modules/generic/default.nix index 12a095e10bb5..339e58029045 100644 --- a/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -38,7 +38,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; @@ -47,16 +47,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" ]; |