From 645709eaa5a68da036132f274447b18198477e94 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" <william@wkennington.com> Date: Fri, 28 Aug 2015 16:29:22 -0700 Subject: [PATCH] go1.5: Remove the bootstrap as it is unneeded --- pkgs/development/compilers/go/1.5.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix index 8e9adf165f6..4f9e8b25b75 100644 --- a/pkgs/development/compilers/go/1.5.nix +++ b/pkgs/development/compilers/go/1.5.nix @@ -11,12 +11,6 @@ let find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ ''; - - removeReferences = [ go_1_4 ]; - - removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: '' - | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ - ''); in stdenv.mkDerivation rec { @@ -112,11 +106,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - while read file; do - cat $file ${removeExpr removeReferences} > $file.tmp - mv $file.tmp $file - chmod +x $file - done < <(find $out/share/go/pkg/bootstrap/bin -type f 2>/dev/null) + rm -r $out/share/go/pkg/bootstrap ''; setupHook = ./setup-hook.sh;