BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

go: do not wrap with go get tools

Browse source 
See: https://github.com/NixOS/nixpkgs/issues/46603

These tools are not required for `buildGoPackage`, while
significantly affecting closure size and build time.

This essentially reverts 458895db33.
This commit is contained in:
Yegor Timoshenko 2018-10-12 19:29:34 +00:00
parent e2d857a332
commit f969e6e474
No known key found for this signature in database
GPG key ID: C3F7D2B9DFA946A1
3 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/compilers/go/1.10.nix
View file

@ -1,8 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, procps , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
, pcre, cacert, llvm
, Security, Foundation
, makeWrapper, git, subversion, mercurial, bazaar }:
let let
@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
GOCACHE = "off"; GOCACHE = "off";
# perl is used for testing go vet # perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; nativeBuildInputs = [ perl which pkgconfig patch procps ];
buildInputs = [ cacert pcre ] buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@ -165,9 +162,6 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r . $GOROOT cp -r . $GOROOT
( cd $GOROOT/src && ./all.bash ) ( cd $GOROOT/src && ./all.bash )
# (https://github.com/golang/go/wiki/GoGetTools)
wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
''; '';
preFixup = '' preFixup = ''

10
pkgs/development/compilers/go/1.11.nix
View file

@ -1,8 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, procps , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
, pcre, cacert, llvm
, Security, Foundation
, makeWrapper, git, subversion, mercurial, bazaar }:
let let
@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
GOCACHE = "off"; GOCACHE = "off";
# perl is used for testing go vet # perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; nativeBuildInputs = [ perl which pkgconfig patch procps ];
buildInputs = [ cacert pcre ] buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@ -171,9 +168,6 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r . $GOROOT cp -r . $GOROOT
( cd $GOROOT/src && ./all.bash ) ( cd $GOROOT/src && ./all.bash )
# (https://github.com/golang/go/wiki/GoGetTools)
wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
''; '';
preFixup = '' preFixup = ''

10
pkgs/development/compilers/go/1.9.nix
View file

@ -1,8 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, procps , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
, pcre, cacert, llvm
, Security, Foundation
, makeWrapper, git, subversion, mercurial, bazaar }:
let let
@ -35,7 +32,7 @@ stdenv.mkDerivation rec {
}; };
# perl is used for testing go vet # perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; nativeBuildInputs = [ perl which pkgconfig patch procps ];
buildInputs = [ cacert pcre ] buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@ -165,9 +162,6 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cp -r . $GOROOT cp -r . $GOROOT
( cd $GOROOT/src && ./all.bash ) ( cd $GOROOT/src && ./all.bash )
# (https://github.com/golang/go/wiki/GoGetTools)
wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
''; '';
preFixup = '' preFixup = ''