diff options
| author | Paul Meyer <49727155+katexochen@users.noreply.github.com> | 2023-12-30 20:27:34 +0100 |
|---|---|---|
| committer | Paul Meyer <49727155+katexochen@users.noreply.github.com> | 2024-03-28 07:57:19 +0100 |
| commit | fba7582947e1e36d013997885770e2eb19fb8776 (patch) | |
| tree | 76c14455eaa8d1cd702ac1ea67e7bfedcff6db1a | |
| parent | 63a052eb57590c79a94372af7bc329e698dec5ba (diff) | |
treewide: remove explicit `-trimpath` from Go pkgs
| -rw-r--r-- | pkgs/by-name/gc/gcs/package.nix | 2 | ||||
| -rw-r--r-- | pkgs/by-name/gt/gtrash/package.nix | 1 | ||||
| -rw-r--r-- | pkgs/by-name/up/uplosi/package.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/tools/language-servers/jq-lsp/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/slsa-verifier/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/video/go2rtc/default.nix | 4 |
6 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix index 406db2018624b..1493836491af4 100644 --- a/pkgs/by-name/gc/gcs/package.nix +++ b/pkgs/by-name/gc/gcs/package.nix @@ -56,7 +56,7 @@ buildGoModule rec { ]; # flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh - flags = [ "-a -trimpath" ]; + flags = [ "-a" ]; ldflags = [ "-s" "-w" "-X github.com/richardwilkes/toolbox/cmdline.AppVersion=${version}" ]; installPhase = '' diff --git a/pkgs/by-name/gt/gtrash/package.nix b/pkgs/by-name/gt/gtrash/package.nix index aee737aa83dff..fb354bada06c2 100644 --- a/pkgs/by-name/gt/gtrash/package.nix +++ b/pkgs/by-name/gt/gtrash/package.nix @@ -23,7 +23,6 @@ buildGoModule rec { doCheck = false; CGO_ENABLED = 0; - GOFLAGS = [ "-trimpath" ]; ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/up/uplosi/package.nix b/pkgs/by-name/up/uplosi/package.nix index 57d7fab92ec72..101f29e85be92 100644 --- a/pkgs/by-name/up/uplosi/package.nix +++ b/pkgs/by-name/up/uplosi/package.nix @@ -18,7 +18,6 @@ buildGoModule rec { CGO_ENABLED = "0"; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - flags = [ "-trimpath" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/language-servers/jq-lsp/default.nix b/pkgs/development/tools/language-servers/jq-lsp/default.nix index 13f8527906625..6952bea00d63e 100644 --- a/pkgs/development/tools/language-servers/jq-lsp/default.nix +++ b/pkgs/development/tools/language-servers/jq-lsp/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { # based on https://github.com/wader/jq-lsp/blob/master/.goreleaser.yml CGO_ENABLED = 0; - GOFLAGS = [ "-trimpath" ]; + ldflags = [ "-s" "-w" diff --git a/pkgs/tools/security/slsa-verifier/default.nix b/pkgs/tools/security/slsa-verifier/default.nix index 1ed192c732a15..d3dc65ba15232 100644 --- a/pkgs/tools/security/slsa-verifier/default.nix +++ b/pkgs/tools/security/slsa-verifier/default.nix @@ -17,8 +17,6 @@ buildGoModule rec { vendorHash = "sha256-rCGj2o59US2t/ckqXirEDgYn9dGvVSzMVcFEZosasBc="; CGO_ENABLED = 0; - GO111MODULE = "on"; - GOFLAGS = "-trimpath"; subPackages = [ "cli/slsa-verifier" ]; diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix index 8ee378d6c264f..12bb7f2b0b0f3 100644 --- a/pkgs/tools/video/go2rtc/default.nix +++ b/pkgs/tools/video/go2rtc/default.nix @@ -16,10 +16,6 @@ buildGoModule rec { vendorHash = "sha256-KEW3ykEZvL6y1VacDIqtHW9B2RLHlHC29aqJjkEnRqQ="; - buildFlagArrays = [ - "-trimpath" - ]; - CGO_ENABLED = 0; ldflags = [ |