From 26f9ea6dd5d93e8d39303c31a757c42dc602b304 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 29 Aug 2015 13:25:00 -0700
Subject: [PATCH] goPackages: Fix tools

---
 pkgs/development/go-modules/generic/default.nix | 2 +-
 pkgs/top-level/go-packages.nix                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index de4f0803c34..5d65fbc0dea 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -137,7 +137,7 @@ go.stdenv.mkDerivation (
     done < <(find . -type f)
     popd
 
-    mkdir $bin
+    mkdir -p $bin
     dir="$NIX_BUILD_TOP/go/bin"
     [ -e "$dir" ] && cp -r $dir $bin
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index c32d7c865d1..c2159581b82 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -133,7 +133,7 @@ let
       mkdir -p $bin/bin
       eval $(go env | grep GOTOOLDIR)
       find $GOTOOLDIR -type f | while read x; do
-        ln -sv "$x" "$binbin"
+        ln -sv "$x" "$bin/bin"
       done
       export GOTOOLDIR=$bin/bin
     '';