summary refs log tree commit diff
path: root/pkgs/development/compilers/go/1.6.nix
diff options
context:
space:
mode:
authorCharles Strahan <charles@cstrahan.com>2016-03-23 18:11:32 -0400
committerCharles Strahan <charles@cstrahan.com>2016-03-23 18:14:02 -0400
commitc18106a223fe73dcb95b3d66b5a435a85126293e (patch)
tree6ab90759ab7c7a38a64f666cbf9380deab56e7e5 /pkgs/development/compilers/go/1.6.nix
parent9289d383e2c7a3b5e6fa05a012af6b4581d64a46 (diff)
downloadnixlib-c18106a223fe73dcb95b3d66b5a435a85126293e.tar
nixlib-c18106a223fe73dcb95b3d66b5a435a85126293e.tar.gz
nixlib-c18106a223fe73dcb95b3d66b5a435a85126293e.tar.bz2
nixlib-c18106a223fe73dcb95b3d66b5a435a85126293e.tar.lz
nixlib-c18106a223fe73dcb95b3d66b5a435a85126293e.tar.xz
nixlib-c18106a223fe73dcb95b3d66b5a435a85126293e.tar.zst
nixlib-c18106a223fe73dcb95b3d66b5a435a85126293e.zip
go-1.6: fix segfault when using musl
See https://github.com/golang/go/issues/14476
Diffstat (limited to 'pkgs/development/compilers/go/1.6.nix')
-rw-r--r--pkgs/development/compilers/go/1.6.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index e941910a41b2..d9924c567442 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 }:
 
@@ -96,6 +96,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