Merge remote-tracking branch 'upstream/master' into hardened-stdenv

1 files changed, 12 insertions, 1 deletions

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index d3739ddef5c2..7572dfddd305 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, tzdata, iana_etc, go_1_4, runCommand
-, perl, which, pkgconfig, patch
+, perl, which, pkgconfig, patch, fetchpatch
 , pcre
 , Security, Foundation }:
 
@@ -48,6 +48,11 @@ stdenv.mkDerivation rec {
     cd go
     patchShebangs ./ # replace /bin/bash
 
+    # This script produces another script at run time,
+    # and thus it is not corrected by patchShebangs.
+    substituteInPlace misc/cgo/testcarchive/test.bash \
+      --replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
+
     # Disabling the 'os/http/net' tests (they want files not available in
     # chroot builds)
     rm src/net/{listen,parse}_test.go
@@ -93,6 +98,12 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./remove-tools-1.5.patch
+    # Fix bug when using musl (see https://github.com/golang/go/issues/14476)
+    # Should be fixed by go 1.6.1
+    (fetchpatch {
+      url = "https://github.com/golang/go/commit/1439158120742e5f41825de90a76b680da64bf76.patch";
+      sha256 = "0yixpbx056ns5wgd3f4absgiyc2ymmqk8mkhhz5ja90dvilzxcwd";
+    })
   ]
   # -ldflags=-s is required to compile on Darwin, see
   # https://github.com/golang/go/issues/11994