14 files changed, 38 insertions, 6 deletions
diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix
index 8e89d75dd54..59e381e9e22 100644
--- a/pkgs/applications/networking/pond/default.nix
+++ b/pkgs/applications/networking/pond/default.nix
@@ -18,6 +18,8 @@ buildGoPackage rec {
     
   buildFlags = "--tags nogui";
 
+  dontInstallSrc = true;
+
   meta = with lib; {
     description = "Forward secure, asynchronous messaging for the discerning";
     homepage = https://pond.imperialviolet.org;
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 64310054555..ef4c1a58230 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -20,6 +20,8 @@ buildGoPackage rec {
 
   doCheck = true;
 
+  dontInstallSrc = true;
+
   meta = {
     homepage = http://syncthing.net/;
     description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized";
diff --git a/pkgs/development/compilers/go/gox.nix b/pkgs/development/compilers/go/gox.nix
index 5e0ff97eada..1833ca37d0e 100644
--- a/pkgs/development/compilers/go/gox.nix
+++ b/pkgs/development/compilers/go/gox.nix
@@ -15,6 +15,10 @@ buildGoPackage rec {
 
   buildInputs = [ iochan ];
 
+  propagatedBuildInputs = [ go ];
+
+  dontInstallSrc = true;
+
   meta = with lib; {
     description = "A simple, no-frills tool for Go cross compilation that behaves a lot like standard go build";
     homepage    = https://github.com/mitchellh/gox;
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index fcf991f12f2..5dcfa4502ac 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -64,12 +64,16 @@ go.stdenv.mkDerivation ( args // {
   installPhase = args.installPhase or ''
     runHook preInstall
 
-    local dir
-    for d in pkg src; do
-        mkdir -p $out/share/go
-        dir="$NIX_BUILD_TOP/go/$d"
-        [ -e "$dir" ] && cp -r $dir $out/share/go
-    done
+    mkdir $out
+
+    if [ -z "$dontInstallSrc" ]; then
+        local dir
+        for d in pkg src; do
+            mkdir -p $out/share/go
+            dir="$NIX_BUILD_TOP/go/$d"
+            [ -e "$dir" ] && cp -r $dir $out/share/go
+        done
+    fi
 
     dir="$NIX_BUILD_TOP/go/bin"
     [ -e "$dir" ] && cp -r $dir $out
diff --git a/pkgs/development/tools/etcdctl/default.nix b/pkgs/development/tools/etcdctl/default.nix
index 5fea6012ccf..ae2c06d5a22 100644
--- a/pkgs/development/tools/etcdctl/default.nix
+++ b/pkgs/development/tools/etcdctl/default.nix
@@ -13,6 +13,8 @@ buildGoPackage rec {
     sha256 = "1kbri59ppil52v7s992q8r6i1zk9lac0s2w00z2lsgc9w1z59qs0";
   };
 
+  dontInstallSrc = true;
+
   meta = with lib; {
     description = "A simple command line client for etcd";
     homepage = http://coreos.com/using-coreos/etcd/;
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 0472f5aaaa3..96dc059ae3f 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -15,6 +15,8 @@ buildGoPackage rec {
 
   subPackages = [ "./" ];
 
+  dontInstallSrc = true;
+
   meta = with lib; {
     description = "An autocompletion daemon for the Go programming language";
     homepage = https://github.com/nsf/gocode;
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index 382e67ed74c..7be4f84680a 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -16,6 +16,8 @@ buildGoPackage rec {
 
   subPackages = [ "golint" ];
 
+  dontInstallSrc = true;
+
   meta = with lib; {
     description = "Linter for Go source code";
     homepage = https://github.com/golang/lint;
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
index c7d265a10dc..8ba61f793d7 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -15,6 +15,8 @@ buildGoPackage rec {
     sha256 = "1drbypby0isdmkq44jmlv59k3jrwvq2jciaccxx2qc2nnx444fkq";
   };
 
+  dontInstallSrc = true;
+
   meta = with lib; {
     description = "Ctags-compatible tag generator for Go";
     homepage = https://github.com/nsf/gotags;
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index 89ea70d46c5..abec19663ff 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -15,6 +15,8 @@ buildGoPackage rec {
 
   subPackages = [ "./" ];
 
+  dontInstallSrc = true;
+
   meta = with lib; {
     description = "A highly-available key value store for shared configuration and service discovery";
     homepage = http://coreos.com/using-coreos/etcd/;
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
index 9810250943c..a7b77b8802a 100644
--- a/pkgs/servers/nsq/default.nix
+++ b/pkgs/servers/nsq/default.nix
@@ -20,6 +20,8 @@ buildGoPackage rec {
 
   buildInputs = [ go-nsq go-options toml perks go-hostpool ];
 
+  dontInstallSrc = true;
+
   meta = with lib; {
     description = "A realtime distributed messaging platform";
     homepage = http://nsq.io/;
diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix
index c0293caa3a2..381fe6ddc1e 100644
--- a/pkgs/servers/serfdom/default.nix
+++ b/pkgs/servers/serfdom/default.nix
@@ -16,6 +16,8 @@ buildGoPackage rec {
 
   buildInputs = [ cli mapstructure memberlist logutils go-syslog mdns columnize circbuf ];
 
+  dontInstallSrc = true;
+
   meta = with lib; {
     description = "A service discovery and orchestration tool that is decentralized, highly available, and fault tolerant";
     homepage = http://www.serfdom.io/;
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
index 7b92f98d5f3..cf521425a76 100644
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -17,6 +17,8 @@ buildGoPackage rec {
 
   subPackages = [ "./" ];
 
+  dontInstallSrc = true;
+
   meta = with lib; {
     description = "A simple FUSE filesystem for mounting Android devices as a MTP device";
     homepage    = https://github.com/hanwen/go-mtpfs;
diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix
index fa890cfe0fc..c3019d722af 100644
--- a/pkgs/tools/misc/ngrok/default.nix
+++ b/pkgs/tools/misc/ngrok/default.nix
@@ -29,6 +29,8 @@ buildGoPackage rec {
 
   buildFlags = "-tags release";
 
+  dontInstallSrc = true;
+
   meta = with stdenv.lib; {
     description = "Reverse proxy that creates a secure tunnel between from a public endpoint t
 o a locally running web service";
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index b714fe8bc59..3c439541e91 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -13,6 +13,8 @@ buildGoPackage rec {
     sha256 = "1f7x6a2c8ix6j5y1r0dq56b58bl2rs2ycbdqb9fz5zv1zk2w20rd";
   };
 
+  dontInstallSrc = true;
+
   meta = with lib; {
     description = "Flannel is an etcd backed network fabric for containers";
     homepage = https://github.com/coreos/flannel;