Merge pull request #57296 from kalbasit/nixpkgs_go-fixes
Fixes to a few Go packages.
commitc75cb87721bea02d01a03558a7b7f5aa5243e2b7
authorWael Nasreddine <wael.nasreddine@gmail.com>
dateMon 11 Mar 2019, 13:11 (8 years ago)
parent636910e7cb4e4b
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix+2−2
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [ ruby bundler go ];
1515
16− GOCACHE="$TMPDIR/go-cache";
17−
1816 patches = [ ./remove-hardcoded-locations.patch ];
1917
2018 installPhase = ''
19+ export GOCACHE="$TMPDIR/go-cache"
20+
2121 ruby bin/compile
2222 mkdir -p $out/
2323 cp -R . $out/
pkgs/applications/virtualization/docker/default.nix+3−2
@@ -94,13 +94,14 @@ rec {
9494
9595 dontStrip = true;
9696
97− buildPhase = (optionalString (stdenv.isLinux) ''
97+ buildPhase = ''
98+ export GOCACHE="$TMPDIR/go-cache"
99+ '' + (optionalString (stdenv.isLinux) ''
98100 # build engine
99101 cd ./components/engine
100102 export AUTO_GOPATH=1
101103 export DOCKER_GITCOMMIT="${rev}"
102104 export VERSION="${version}"
103− export GOCACHE="$TMPDIR/go-cache"
104105 ./hack/make.sh dynbinary
105106 cd -
106107 '') + ''
pkgs/desktops/deepin/go-dbus-generator/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 makeFlags = [
2121 "PREFIX=$(out)"
22− "GOCACHE=$TMPDIR/go-cache"
22+ "GOCACHE=$(TMPDIR)/go-cache"
2323 ];
2424
2525 passthru.updateScript = deepin.updateScript { inherit name; };
pkgs/desktops/deepin/go-gir-generator/default.nix+1−1
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737
3838 makeFlags = [
3939 "PREFIX=$(out)"
40− "GOCACHE=$TMPDIR/go-cache"
40+ "GOCACHE=$(TMPDIR)/go-cache"
4141 ];
4242
4343 passthru.updateScript = deepin.updateScript { inherit name; };
pkgs/development/libraries/boringssl/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 enableParallelBuilding = true;
1616 NIX_CFLAGS_COMPILE = "-Wno-error";
1717
18− GOCACHE="$TMPDIR/go-cache";
18+ makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ];
1919
2020 installPhase = ''
2121 mkdir -p $out/bin $out/include $out/lib
pkgs/servers/monitoring/cadvisor/default.nix+1−2
@@ -13,9 +13,8 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ go ];
1515
16− GOCACHE="$TMPDIR/go-cache";
17−
1816 buildPhase = ''
17+ export GOCACHE="$TMPDIR/go-cache"
1918 mkdir -p Godeps/_workspace/src/github.com/google/
2019 ln -s $(pwd) Godeps/_workspace/src/github.com/google/cadvisor
2120 GOPATH=$(pwd)/Godeps/_workspace go build -v -o cadvisor github.com/google/cadvisor
pkgs/tools/security/vault/default.nix+1−2
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ go gox removeReferencesTo ];
1515
16− GOCACHE="$TMPDIR/go-cache";
17−
1816 preBuild = ''
1917 patchShebangs ./
2018 substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}'
@@ -24,6 +22,7 @@ stdenv.mkDerivation rec {
2422 ln -s $(pwd) src/github.com/hashicorp/vault
2523
2624 export GOPATH=$(pwd)
25+ export GOCACHE="$TMPDIR/go-cache"
2726 '';
2827
2928 installPhase = ''