From 9ea0363e6f34a9f41b3c849359c97f06dbec2b9f Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Fri, 22 Nov 2019 16:14:52 +0000
Subject: fix(buildGo): Use stable build ID when linking outputs

This is another step towards build reproducibility, which Go is
traditionally very bad at.
---
 overrides/buildGo.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'overrides')

diff --git a/overrides/buildGo.nix b/overrides/buildGo.nix
index 7ba9000e18..72d8c232f6 100644
--- a/overrides/buildGo.nix
+++ b/overrides/buildGo.nix
@@ -50,9 +50,9 @@ let
   program = { name, srcs, deps ? [] }:
   let uniqueDeps = allDeps deps;
   in runCommand name {} ''
-    ${go}/bin/go tool compile -o ${name}.a -trimpath=$PWD ${includeSources uniqueDeps} ${spaceOut srcs}
+    ${go}/bin/go tool compile -o ${name}.a -trimpath=$PWD -trimpath=${go} ${includeSources uniqueDeps} ${spaceOut srcs}
     mkdir -p $out/bin
-    ${go}/bin/go tool link -o $out/bin/${name} ${includeLibs uniqueDeps} ${name}.a
+    ${go}/bin/go tool link -o $out/bin/${name} -buildid nix ${includeLibs uniqueDeps} ${name}.a
   '';
 
   # Build a Go library assembled out of the specified files.
-- 
cgit 1.4.1