From d376b10105de00c7c03d8c7cb7d26af1f7f6b6a0 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 2 Sep 2016 16:13:38 +0100
Subject: [PATCH] packer: fixes compilation issues (#18217)

* the default output for buildGoPackage is not "out" anymore
* go 1.7 has removed the linker flag deprecation which breaks packer's
  Makefile
---
 pkgs/development/tools/packer/default.nix |  4 ++--
 pkgs/top-level/all-packages.nix           | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 5b8c13e3baf9..7e8e2092ceb7 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -5,9 +5,9 @@ stdenv.mkDerivation rec {
   name = "packer-${version}";
   version = "0.10.1";
 
-  src = import ./deps.nix {
+  src = (import ./deps.nix {
     inherit stdenv lib gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn;
-  };
+  }).out;
 
   buildInputs = [ src.go gox gotools ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6826d4bc5d01..ed7bb3611f06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -170,7 +170,17 @@ in
 
   fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { };
 
-  packer = callPackage ../development/tools/packer { };
+  packer = callPackage ../development/tools/packer {
+    # Go 1.7 changed the linker flag format
+    buildGoPackage = buildGo16Package;
+    gotools = self.gotools.override {
+      buildGoPackage = buildGo16Package;
+      go = self.go_1_6;
+    };
+    gox = self.gox.override {
+      buildGoPackage = buildGo16Package;
+    };
+  };
 
   fetchpatch = callPackage ../build-support/fetchpatch { };