diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-10-29 13:27:20 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-11-18 08:13:34 +1000 |
| commit | 4e9f7bbf8573d07f7b0c87d97c026cd4aad5a758 (patch) | |
| tree | 4396c755e36915f45cb5f2171bbf37e6c0fbcb19 /pkgs/development/go-packages | |
| parent | 9f035ff85724eb495efd341f9be3ceae7aa4f85e (diff) | |
| download | nixpkgs-4e9f7bbf8573d07f7b0c87d97c026cd4aad5a758.tar nixpkgs-4e9f7bbf8573d07f7b0c87d97c026cd4aad5a758.tar.gz nixpkgs-4e9f7bbf8573d07f7b0c87d97c026cd4aad5a758.tar.bz2 nixpkgs-4e9f7bbf8573d07f7b0c87d97c026cd4aad5a758.tar.lz nixpkgs-4e9f7bbf8573d07f7b0c87d97c026cd4aad5a758.tar.xz nixpkgs-4e9f7bbf8573d07f7b0c87d97c026cd4aad5a758.tar.zst nixpkgs-4e9f7bbf8573d07f7b0c87d97c026cd4aad5a758.zip | |
buildGo{Package,Module}: set trimpath in GOFLAGS
Also drop removeReferencesTo `-trimpath` removes all file system paths from the compiled executable, this should improve reproducibility.
Diffstat (limited to 'pkgs/development/go-packages')
| -rw-r--r-- | pkgs/development/go-packages/generic/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 5c54e04652f..ab8ee9166f9 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -1,5 +1,5 @@ { go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync -, removeReferencesTo, fetchFromGitHub, stdenv }: +, fetchFromGitHub, stdenv }: { buildInputs ? [] , nativeBuildInputs ? [] @@ -44,10 +44,6 @@ with builtins; let - removeReferences = [ ] ++ lib.optional (!allowGoReference) go; - - removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; - dep2src = goDep: { inherit (goDep) goPackagePath; @@ -78,7 +74,7 @@ let package = stdenv.mkDerivation ( (builtins.removeAttrs args [ "goPackageAliases" "disabled" "extraSrcs"]) // { - nativeBuildInputs = [ removeReferencesTo go ] + nativeBuildInputs = [ go ] ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; buildInputs = buildInputs; @@ -88,6 +84,7 @@ let GOHOSTOS = go.GOHOSTOS or null; GO111MODULE = "off"; + GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ]; GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); @@ -225,10 +222,6 @@ let runHook postInstall ''; - preFixup = preFixup + '' - find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true - ''; - strictDeps = true; shellHook = '' |