diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index d244abf2e68..1651835e30e 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -30,11 +30,13 @@ buildGoModule rec { subPackages = [ "." ]; - preBuild = let t = "github.com/minio/minio/cmd"; in - '' - export CGO_ENABLED=0 - buildFlagsArray+=("-tags" "kqueue" "-ldflags" "-s -w -X ${t}.Version=${versionToTimestamp version} -X ${t}.ReleaseTag=RELEASE.${version} -X ${t}.CommitID=${src.rev}") - ''; + CGO_ENABLED = 0; + + tags = [ "kqueue" ]; + + ldflags = let t = "github.com/minio/minio/cmd"; in [ + "-s" "-w" "-X ${t}.Version=${versionToTimestamp version}" "-X ${t}.ReleaseTag=RELEASE.${version}" "-X ${t}.CommitID=${src.rev}" + ]; passthru.tests.minio = nixosTests.minio; diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 1e65689444f..bba51c6a803 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -102,12 +102,12 @@ in buildGoModule { go generate popd done - export buildFlagsArray=( - -tags="assets" - -ldflags="-X main.commit=${shorthash} -X main.version=${version}" - ) ''; + tags = [ "assets" ]; + + ldflags = [ "-X main.commit=${shorthash}" "-X main.version=${version}" ]; + meta = with lib; { description = "An open-source distributed time series database"; license = licenses.mit; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 2e1f68f6b12..c642784af92 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -21,12 +21,9 @@ buildGoModule rec { subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; - preBuild = '' - export buildFlagsArray=( - -tags="xversion" - -ldflags="-X tailscale.com/version.Long=${version} -X tailscale.com/version.Short=${version}" - ) - ''; + tags = [ "xversion" ]; + + ldflags = [ "-X tailscale.com/version.Long=${version}" "-X tailscale.com/version.Short=${version}" ]; postInstall = '' wrapProgram $out/bin/tailscaled --prefix PATH : ${ diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index e9be1c83005..e184810a29b 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { subPackages = [ "main/pg" ]; - buildFlagsArray = [ - "-tags=brotli libsodium" - "-ldflags=-s -w -X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version} -X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" - ]; + tags = [ "brotli" "libsodium" ]; + + ldflags = [ "-s" "-w" "-X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version}" "-X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" ]; postInstall = '' mv $out/bin/pg $out/bin/wal-g diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 344c74d573c..f5f60f3da2a 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -21,9 +21,8 @@ buildGoModule rec { excludedPackages = "\\(copasetic\\)"; - preBuild = '' - buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"}) - ''; + tags = lib.optionals pivKeySupport [ "pivkey" ]; + ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}" ]; meta = with lib; {