Add dontInstallSrc flag to buildGoPackage

6 files changed, 22 insertions, 6 deletions

diff --git a/pkgs/development/compilers/go/gox.nix b/pkgs/development/compilers/go/gox.nix
index 5e0ff97eada31..1833ca37d0e07 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 fcf991f12f286..5dcfa4502acae 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 5fea6012ccfb0..ae2c06d5a229b 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 0472f5aaaa3f7..96dc059ae3f45 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 382e67ed74cd7..7be4f84680af0 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 c7d265a10dc6d..8ba61f793d7ba 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;