diff options
author | lethalman <lucabru@src.gnome.org> | 2015-06-03 10:47:55 +0200 |
---|---|---|
committer | lethalman <lucabru@src.gnome.org> | 2015-06-03 10:47:55 +0200 |
commit | 219b9a63ade6fd47bd7190dae76ba361c696658f (patch) | |
tree | e97fa0ab84b784045d6913e13c04295544163db4 /pkgs | |
parent | 68a82a91149cacfafce27706ff18ad572317d7a9 (diff) | |
parent | be03ca926239742932d05c8eb4a52bf3e3053a56 (diff) | |
download | nixlib-219b9a63ade6fd47bd7190dae76ba361c696658f.tar nixlib-219b9a63ade6fd47bd7190dae76ba361c696658f.tar.gz nixlib-219b9a63ade6fd47bd7190dae76ba361c696658f.tar.bz2 nixlib-219b9a63ade6fd47bd7190dae76ba361c696658f.tar.lz nixlib-219b9a63ade6fd47bd7190dae76ba361c696658f.tar.xz nixlib-219b9a63ade6fd47bd7190dae76ba361c696658f.tar.zst nixlib-219b9a63ade6fd47bd7190dae76ba361c696658f.zip |
Merge pull request #8135 from sofuture/fix-goimports-build
Fix goimports build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/goimports/default.nix | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix index 91bd207581da..2a8c897ce5ba 100644 --- a/pkgs/development/tools/goimports/default.nix +++ b/pkgs/development/tools/goimports/default.nix @@ -1,11 +1,12 @@ -{ stdenv, lib, go, fetchurl, fetchgit, fetchFromGitHub }: +{ lib, goPackages, fetchFromGitHub }: -stdenv.mkDerivation rec { +with goPackages; + +buildGoPackage rec { rev = "7534f4943d94a318edde90212439e538ed54cdde"; version = "git-2015-04-26"; name = "goimports-${version}"; - - buildInputs = [ go ]; + goPackagePath = "golang.org/x/tools"; src = fetchFromGitHub { inherit rev; @@ -14,15 +15,9 @@ stdenv.mkDerivation rec { sha256 = "12ybykrn92l7awav0wkx9yqpc5z0pdwwi29qs9mdr2xspx61rb50"; }; - buildPhase = '' - export GOPATH=$src - go build -v -o goimports golang.org/x/tools/cmd/goimports - ''; + subPackages = [ "cmd/goimports" ]; - installPhase = '' - mkdir -p $out/bin - mv goimports $out/bin - ''; + dontInstallSrc = true; meta = with lib; { description = "Import management tool for go"; |