From c08a49bffc6cc4acf3dcde6072e1c21104a9c69d Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Jan 2015 18:39:31 +0100 Subject: [PATCH] go: Remove explicitly adding libgcc_s.so. As of 65221567c12eb20d1254f6bc1b573e126af43645, it's no longer needed. This is part of an attempt to fix nixpkgs tarball evaluation. Signed-off-by: aszlig --- pkgs/development/compilers/go/1.3.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index 8f4bd50326d..2f23698059f 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -80,12 +80,6 @@ stdenv.mkDerivation { installPhase = '' export CC=cc - '' + stdenv.lib.optionalString (stdenv ? cc) '' - # http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html - # Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work" - # during tests: - export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.gcc}/lib/libgcc_s.so))" - '' + '' mkdir -p "$out/bin" export GOROOT="$(pwd)/" export GOBIN="$out/bin"