ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

packer: fixes compilation issues (#18217)

Browse Source 
* the default output for buildGoPackage is not "out" anymore
* go 1.7 has removed the linker flag deprecation which breaks packer's
  Makefile
This commit is contained in:
zimbatm 2016-09-02 16:13:38 +01:00 committed by Domen Kožar
parent be0168f831
commit d376b10105
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/packer/default.nix
View File

@ -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 ];

12
pkgs/top-level/all-packages.nix
View File

@ -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 { };