treewide: buildFlagsArray -> ldflags

9 files changed, 33 insertions, 38 deletions

diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix
index c9d06d49771..13bf9326c22 100644
--- a/pkgs/servers/cayley/default.nix
+++ b/pkgs/servers/cayley/default.nix
@@ -15,10 +15,9 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  buildFlagsArray = ''
-    -ldflags=
-      -X=main.Version=${version}
-  '';
+  ldflags = [
+    "-X=main.Version=${version}"
+  ];
 
   meta = {
     homepage = "https://cayley.io/";
diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix
index d0a3d9c10a2..8f3739b4ebf 100644
--- a/pkgs/servers/gotify/default.nix
+++ b/pkgs/servers/gotify/default.nix
@@ -45,8 +45,8 @@ buildGoModule rec {
   # produce binaries which panic when executed and are not interesting at all
   subPackages = [ "." ];
 
-  buildFlagsArray = [
-    "-ldflags=-X main.Version=${version} -X main.Mode=prod"
+  ldflags = [
+    "-X main.Version=${version}" "-X main.Mode=prod"
   ];
 
   meta = with lib; {
diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix
index 0032c4a630e..d4c358ec47f 100644
--- a/pkgs/servers/mail/mailhog/default.nix
+++ b/pkgs/servers/mail/mailhog/default.nix
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y";
   };
 
-  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
 
   meta = with lib; {
     description = "Web and API based SMTP testing";
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 6a7ba06df88..14996cecc65 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -16,10 +16,9 @@ let
 
     goPackagePath = "github.com/mattermost/mattermost-server";
 
-    buildFlagsArray = ''
-      -ldflags=
-        -X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}
-    '';
+    ldflags = [
+      "-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}"
+    ];
 
   };
 
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index bc3cf7539ec..251c977bd4d 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -14,15 +14,14 @@ buildGoPackage rec {
     sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41";
   };
 
-  buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
-    -ldflags=
-       -X ${t}.Version=${version}
-       -X ${t}.Revision=${src.rev}
-       -X ${t}.Branch=unknown
-       -X ${t}.BuildUser=nix@nixpkgs
-       -X ${t}.BuildDate=unknown
-       -X ${t}.GoVersion=${lib.getVersion go}
-  '';
+  ldflags = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [
+    "-X ${t}.Version=${version}"
+    "-X ${t}.Revision=${src.rev}"
+    "-X ${t}.Branch=unknown"
+    "-X ${t}.BuildUser=nix@nixpkgs"
+    "-X ${t}.BuildDate=unknown"
+    "-X ${t}.GoVersion=${lib.getVersion go}"
+  ];
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 65206256194..8b39915193e 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -6,8 +6,8 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
 
-  buildFlagsArray = [
-    "-ldflags=" "-X main.version=${version}"
+  ldflags = [
+    "-X main.version=${version}"
   ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix
index a439c84bca9..84cb7a62f24 100644
--- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix
@@ -11,12 +11,11 @@ buildGoPackage rec {
     sha256 = "sha256-G4bTYFm1Zh+7gfSIZnfrPyQ15967ebEzl33pgZu23D4=";
   };
 
-  buildFlagsArray = ''
-    -ldflags=
-      -s -w
-      -X github.com/tomcz/openldap_exporter.tag=v${version}
-      -X github.com/tomcz/openldap_exporter.commit=unknown
-  '';
+  ldflags = [
+    "-s" "-w"
+    "-X github.com/tomcz/openldap_exporter.tag=v${version}"
+    "-X github.com/tomcz/openldap_exporter.commit=unknown"
+  ];
 
   goPackagePath = "github.com/tomcz/openldap_exporter";
 
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 0bdb0680ae9..f14ceec44e2 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -17,15 +17,14 @@ buildGoPackage rec {
   buildUser = "nix@nixpkgs";
   buildDate = "19700101-00:00:00";
 
-  buildFlagsArray = ''
-    -ldflags=
-        -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version}
-        -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev}
-        -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev}
-        -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser}
-        -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate}
-        -X main.goVersion=${lib.getVersion go}
-  '';
+  ldflags = [
+    "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version}"
+    "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev}"
+    "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev}"
+    "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser}"
+    "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate}"
+    "-X main.goVersion=${lib.getVersion go}"
+  ];
 
   doInstallCheck = true;
   installCheckPhase = ''
diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix
index 5e3aa2d0ef6..d94f97baf86 100644
--- a/pkgs/servers/tegola/default.nix
+++ b/pkgs/servers/tegola/default.nix
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "sha256-NA2KwyhLLIusf6a6v+OcmHz91kPcIhvG9PRmRk8h+fQ=";
   };
 
-  buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ];
+  ldflags = [ "-s" "-w" "-X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ];
 
   excludedPackages = [ "example" ];