From c18106a223fe73dcb95b3d66b5a435a85126293e Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Wed, 23 Mar 2016 18:11:32 -0400 Subject: [PATCH] go-1.6: fix segfault when using musl See https://github.com/golang/go/issues/14476 --- pkgs/development/compilers/go/1.6.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index e941910a41b..d9924c56744 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