diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-07 09:55:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 09:55:15 +0100 |
| commit | 5a02143c206e8658e6e79047a6db206ace36f22d (patch) | |
| tree | 0de386befe2c1a6337d0808218436f3521ea1188 /pkgs/development/compilers/go | |
| parent | 84f973601404331e8670ecdc6fc22aa8c6b5b2d2 (diff) | |
| parent | 091c2b9f04189301f18ff0bc8336541d137f1d61 (diff) | |
| download | nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar.gz nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar.bz2 nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar.lz nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar.xz nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.tar.zst nixlib-5a02143c206e8658e6e79047a6db206ace36f22d.zip | |
Merge pull request #33010 from LnL7/cacert-hook
cacert: add hook that sets SSL_CERT_FILE
Diffstat (limited to 'pkgs/development/compilers/go')
| -rw-r--r-- | pkgs/development/compilers/go/1.7.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.8.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.9.nix | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index b1230da5a142..82ed9b53c60f 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch ]; - buildInputs = [ pcre ]; + buildInputs = [ cacert pcre ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; @@ -116,8 +116,6 @@ stdenv.mkDerivation rec { }) ]; - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 23fd3b0f2912..651eb79d75a7 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] ++ optionals stdenv.isLinux [ procps ]; - buildInputs = [ pcre ] + buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; @@ -122,8 +122,6 @@ stdenv.mkDerivation rec { substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil ''; - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index e908a8725e2a..aab7964148b4 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] ++ optionals stdenv.isLinux [ procps ]; - buildInputs = [ pcre ] + buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; @@ -128,8 +128,6 @@ stdenv.mkDerivation rec { substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil ''; - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" else if stdenv.system == "i686-linux" then "386" |