diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-17 12:50:46 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-17 12:50:46 +0200 |
| commit | 67c73b4e64b01657ce9ea9bb2d8c015754ef3150 (patch) | |
| tree | 7358277e028232ad5f37da0892ee2bb6860373b5 /pkgs/development/compilers/go/1.8.nix | |
| parent | 5ab499d2c753209381e721a66204fe7869d6dac9 (diff) | |
| parent | 2e56ba6fbdd70ed6b9244df816670b9a94da0824 (diff) | |
| download | nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.gz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.bz2 nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.lz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.xz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.zst nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.zip | |
Merge commit '2e56ba' from staging into master
Diffstat (limited to 'pkgs/development/compilers/go/1.8.nix')
| -rw-r--r-- | pkgs/development/compilers/go/1.8.nix | 4 |
1 files changed, 1 insertions, 3 deletions
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" |