From 13ea123c74cdcb33cdc376b16677044512615afa Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:45:51 +1000 Subject: treewide: buildFlagsArray -> ldflags --- pkgs/servers/blockbook/default.nix | 11 +++++------ pkgs/servers/dex/default.nix | 4 ++-- pkgs/servers/hasura/cli.nix | 10 +++++----- pkgs/servers/http/pomerium/default.nix | 4 ++-- pkgs/servers/maddy/default.nix | 2 +- pkgs/servers/matrix-corporal/default.nix | 4 ++-- pkgs/servers/miniflux/default.nix | 6 +++--- pkgs/servers/misc/gobgpd/default.nix | 7 +++---- .../monitoring/alertmanager-irc-relay/default.nix | 2 +- pkgs/servers/monitoring/cadvisor/default.nix | 2 +- pkgs/servers/monitoring/do-agent/default.nix | 7 +++---- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- pkgs/servers/monitoring/mackerel-agent/default.nix | 9 ++++----- pkgs/servers/monitoring/mtail/default.nix | 4 ++-- .../monitoring/prometheus/artifactory-exporter.nix | 15 +++++++-------- pkgs/servers/monitoring/prometheus/mysqld-exporter.nix | 16 ++++++++-------- pkgs/servers/monitoring/prometheus/promscale.nix | 2 +- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 9 ++++----- pkgs/servers/monitoring/prometheus/smokeping-prober.nix | 4 ++-- pkgs/servers/monitoring/sensu-go/default.nix | 11 +++++------ pkgs/servers/monitoring/thanos/default.nix | 15 +++++++-------- pkgs/servers/monitoring/unifi-poller/default.nix | 14 +++++++------- pkgs/servers/nosql/influxdb/default.nix | 2 +- pkgs/servers/nosql/victoriametrics/default.nix | 2 +- pkgs/servers/oauth2-proxy/default.nix | 2 +- pkgs/servers/pg_featureserv/default.nix | 2 +- pkgs/servers/pg_tileserv/default.nix | 2 +- pkgs/servers/reproxy/default.nix | 4 ++-- pkgs/servers/rtsp-simple-server/default.nix | 8 ++++---- 29 files changed, 89 insertions(+), 97 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 8d75b89d0d8a..b10f8919af7a 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -33,12 +33,11 @@ buildGoModule rec { buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ]; - buildFlagsArray = '' - -ldflags= - -X github.com/trezor/blockbook/common.version=${version} - -X github.com/trezor/blockbook/common.gitcommit=${commit} - -X github.com/trezor/blockbook/common.buildDate=unknown - ''; + ldflags = [ + "-X github.com/trezor/blockbook/common.version=${version}" + "-X github.com/trezor/blockbook/common.gitcommit=${commit}" + "-X github.com/trezor/blockbook/common.buildDate=unknown" + ]; preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 9d577047ee21..0f4282699ee2 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -17,8 +17,8 @@ buildGoModule rec { "cmd/dex" ]; - buildFlagsArray = [ - "-ldflags=-w -s -X github.com/dexidp/dex/version.Version=${src.rev}" + ldflags = [ + "-w" "-s" "-X github.com/dexidp/dex/version.Version=${src.rev}" ]; postInstall = '' diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index 4338f1bcaed8..a65d4bb38234 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -13,11 +13,11 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [''-ldflags= - -X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version} - -s - -w - '']; + ldflags = [ + "-X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version}" + "-s" + "-w" + ]; postInstall = '' mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index ea9628417d7d..7b28200b284e 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { "cmd/pomerium-cli" ]; - buildFlagsArray = let + ldflags = let # Set a variety of useful meta variables for stamping the build with. setVars = { Version = "v${version}"; @@ -35,7 +35,7 @@ buildGoModule rec { }; varFlags = concatStringsSep " " (mapAttrsToList (name: value: "-X github.com/pomerium/pomerium/internal/version.${name}=${value}") setVars); in [ - "-ldflags=${varFlags}" + "${varFlags}" ]; nativeBuildInputs = [ diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index bc6071bff0d2..c5fa1b5e670a 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-bxKEQaOubjRfLX+dMxVDzLOUInHykUdy9X8wvFE6Va4="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/foxcpp/maddy.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; diff --git a/pkgs/servers/matrix-corporal/default.nix b/pkgs/servers/matrix-corporal/default.nix index e489e774be5e..ae455168778f 100644 --- a/pkgs/servers/matrix-corporal/default.nix +++ b/pkgs/servers/matrix-corporal/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "sha256-u1ppwy+t2ewAH0/+R6e0Ja5A3PQG/lUy2b6kgcMVj8E="; }; - buildFlagsArray = [ - "-ldflags=-s -w -X main.GitCommit=${version} -X main.GitBranch=${version} -X main.GitState=nixpkgs -X main.GitSummary=${version} -X main.Version=${version}" + ldflags = [ + "-s" "-w" "-X main.GitCommit=${version}" "-X main.GitBranch=${version}" "-X main.GitState=nixpkgs" "-X main.GitSummary=${version}" "-X main.Version=${version}" ]; vendorSha256 = "sha256-YmUiGsg2UZfV6SHEPwnbmWPhGQ5teV+we9MBaJyrJr4="; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index f66468b240f8..fe61e5fc8b84 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -22,9 +22,9 @@ in buildGoModule { go test $(go list ./... | grep -v client) ''; # skip client tests as they require network access - buildFlagsArray = '' - -ldflags=-s -w -X miniflux.app/version.Version=${version} - ''; + ldflags = [ + "-s" "-w" "-X miniflux.app/version.Version=${version}" + ]; postInstall = '' mv $out/bin/miniflux.app $out/bin/miniflux diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 0a09293226ed..75bc9f8e6088 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - buildFlagsArray = '' - -ldflags= - -s -w -extldflags '-static' - ''; + ldflags = [ + "-s" "-w" "-extldflags '-static'" + ]; subPackages = [ "cmd/gobgpd" ]; diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index f5d4f6ca88f3..5a2fcc4a8976 100644 --- a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4="; - buildFlagsArray = [ "-ldflags=-s -w" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Alertmanager IRC Relay is a bot relaying Prometheus alerts to IRC"; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 8501aa5e02cd..2db3cd084470 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-FMO+wNmjFFD9+/9mhNcyZftk8ryhwFXDZeEy/h5EMWc="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; postInstall = '' mv $out/bin/{cmd,cadvisor} diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index d6e3accdf41d..5f70bf702a6b 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -11,10 +11,9 @@ buildGoModule rec { sha256 = "sha256-boEgCC3uWvJvb6VKpNhh6vHCfeE7oun5oneI2ITKh9g="; }; - buildFlagsArray = '' - -ldflags= - -X main.version=${version} - ''; + ldflags = [ + "-X main.version=${version}" + ]; vendorSha256 = null; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 56f8b30fbb44..996637f51b9e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -43,9 +43,9 @@ buildGoModule rec { rm -r scripts/go ''; - buildFlagsArray = '' - -ldflags=-s -w -X main.version=${version} - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; postInstall = '' tar -xvf $srcStatic diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index d8987f9e5adc..21776c352af1 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -19,11 +19,10 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -X=main.version=${version} - -X=main.gitcommit=v${version} - ''; + ldflags = [ + "-X=main.version=${version}" + "-X=main.gitcommit=v${version}" + ]; postInstall = '' wrapProgram $out/bin/mackerel-agent \ diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index c0a7e1129a14..e5a3179a86c0 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -21,8 +21,8 @@ buildGoModule rec { go generate -x ./internal/vm/ ''; - buildFlagsArray = [ - "-ldflags=-X main.Version=${version}" + ldflags = [ + "-X main.Version=${version}" ]; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 5e7d386d7e1c..a91a267bb210 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -16,14 +16,13 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/prometheus/common/version.Version=${version} - -X github.com/prometheus/common/version.Revision=${rev} - -X github.com/prometheus/common/version.Branch=master - -X github.com/prometheus/common/version.BuildDate=19700101-00:00:00 - ''; + ldflags = [ + "-s" "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/common/version.Branch=master" + "-X github.com/prometheus/common/version.BuildDate=19700101-00:00:00" + ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) artifactory; }; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index e31800f43c0e..894fbd1ab3f1 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -14,14 +14,14 @@ buildGoModule rec { vendorSha256 = "19785rfzlx8h0h8vmg0ghd40h3p4y6ikhgf8rd2qfj5f6qxfhrgv"; - buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' - -ldflags= - -s -w -X ${t}.Version=${version} - -X ${t}.Revision=${rev} - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - ''; + ldflags = let t = "github.com/prometheus/common/version"; in [ + "-s" "-w" + "-X ${t}.Version=${version}" + "-X ${t}.Revision=${rev}" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + ]; # skips tests with external dependencies, e.g. on mysqld checkFlags = [ "-short" ]; diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index 0727616de311..546bfbb7e28c 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "sha256-DFDTYT7UK1cYwGeCgeQcJmrCoqGPDzicusRPPUbH0Gs="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X github.com/timescale/promscale/pkg/version.Version=${version}" "-X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; doCheck = false; # Requires access to a docker daemon doInstallCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index a2636d9f7147..d209f52ef585 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -13,11 +13,10 @@ buildGoModule rec { vendorSha256 = "11237959ikd7l5glkhfz0g55mbld2hq985b5crwb9bnimaly5lga"; - buildFlagsArray = '' - -ldflags= - -X main.BuildVersion=${version} - -X main.BuildCommitSha=unknown - -X main.BuildDate=unknown + ldflags = '' + "-X main.BuildVersion=${version}" + "-X main.BuildCommitSha=unknown" + "-X main.BuildDate=unknown" ''; # needs a redis server diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index b998e1d24c6c..8b1cbb962ade 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "smokeping_prober"; version = "${baseVersion}-g${commit}"; - buildFlagsArray = let + ldflags = let setVars = { Version = baseVersion; Revision = commit; @@ -17,7 +17,7 @@ buildGoModule rec { }; varFlags = lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "-X github.com/prometheus/common/version.${name}=${value}") setVars); in [ - "-ldflags=${varFlags} -s -w" + "${varFlags}" "-s" "-w" ]; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 881d677b3e59..23294dfb88c4 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -20,13 +20,12 @@ let doCheck = false; - buildFlagsArray = let + ldflags = let versionPkg = "github.com/sensu/sensu-go/version"; - in '' - -ldflags= - -X ${versionPkg}.Version=${version} - -X ${versionPkg}.BuildSHA=${shortRev} - ''; + in [ + "-X ${versionPkg}.Version=${version}" + "-X ${versionPkg}.BuildSHA=${shortRev}" + ]; meta = { homepage = "https://sensu.io"; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 03811314f456..fef179945b38 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -16,14 +16,13 @@ buildGoModule rec { subPackages = "cmd/thanos"; - buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=unknown - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - ''; + ldflags = let t = "github.com/prometheus/common/version"; in [ + "-X ${t}.Version=${version}" + "-X ${t}.Revision=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + ]; meta = with lib; { description = "Highly available Prometheus setup with long term storage capabilities"; diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix index 992a92a2733c..745cfdd34595 100644 --- a/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { vendorSha256 = "sha256-LOBkdyfsw7ua6TsLglO5jdR9NWo5Df8rnQ8MH+eIz4g="; - buildFlagsArray = '' - -ldflags=-w -s - -X github.com/prometheus/common/version.Branch=master - -X github.com/prometheus/common/version.BuildDate=unknown - -X github.com/prometheus/common/version.Revision=${src.rev} - -X github.com/prometheus/common/version.Version=${version}-0 - ''; + ldflags = [ + "-w" "-s" + "-X github.com/prometheus/common/version.Branch=master" + "-X github.com/prometheus/common/version.BuildDate=unknown" + "-X github.com/prometheus/common/version.Revision=${src.rev}" + "-X github.com/prometheus/common/version.Version=${version}-0" + ]; meta = with lib; { description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus"; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index df3e116ab74a..4f10beda85cc 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; excludedPackages = "test"; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 12ad70375121..4ef8fe9575f2 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; passthru.tests = { inherit (nixosTests) victoriametrics; }; diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index a5aee60d8bb1..dfc1756b3746 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorSha256 = "sha256-kclpoZ33JOciP2IUCQZB5idA7rgbWxPPFNwZU+pEJFU="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile - buildFlagsArray = ("-ldflags=-X main.VERSION=${version}"); + ldflags = [ "-X main.VERSION=${version}" ]; meta = with lib; { description = "A reverse proxy that provides authentication with Google, Github, or other providers"; diff --git a/pkgs/servers/pg_featureserv/default.nix b/pkgs/servers/pg_featureserv/default.nix index fd31d728a3b2..9a4fd071338e 100644 --- a/pkgs/servers/pg_featureserv/default.nix +++ b/pkgs/servers/pg_featureserv/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1jqrkx850ghmpnfjhqky93r8fq7q63m5ivs0lzljzbvn7ya75f2r"; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ]; meta = with lib; { description = "Lightweight RESTful Geospatial Feature Server for PostGIS in Go"; diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/pg_tileserv/default.nix index b7f1fa0c1c9d..a380af0311b3 100644 --- a/pkgs/servers/pg_tileserv/default.nix +++ b/pkgs/servers/pg_tileserv/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E="; - buildFlagsArray = [ "-ldflags=-s -w -X main.programVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.programVersion=${version}" ]; doCheck = false; diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index 0d25b4267838..25fb5268c146 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -27,8 +27,8 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ - "-ldflags=-s -w -X main.revision=${version}" + ldflags = [ + "-s" "-w" "-X main.revision=${version}" ]; installPhase = '' diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 58b565851236..c6897167cefa 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -19,10 +19,10 @@ buildGoModule rec { # Tests need docker doCheck = false; - buildFlagsArray = [ - # In the future, we might need to switch to `main.Version`, considering: - # https://github.com/aler9/rtsp-simple-server/issues/503 - "-ldflags=-X github.com/aler9/rtsp-simple-server/internal/core.version=v${version}" + # In the future, we might need to switch to `main.Version`, considering: + # https://github.com/aler9/rtsp-simple-server/issues/503 + ldflags = [ + "-X github.com/aler9/rtsp-simple-server/internal/core.version=v${version}" ]; meta = with lib; { -- cgit 1.4.1