treewide: buildFlagsArray -> ldflags

10 files changed, 20 insertions, 24 deletions

diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix
index 0ffa33a1673ab..544ffcaf1ab31 100644
--- a/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/pkgs/tools/admin/exoscale-cli/default.nix
@@ -13,7 +13,7 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/exoscale/cli";
 
-  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ];
+  ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ];
 
   # ensures only the cli binary is built and we don't clutter bin/ with submodules
   subPackages = [ "." ];
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index 759104b9c038d..4f739769807bc 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -20,7 +20,7 @@ buildGoPackage rec {
     ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse
   '';
 
-  buildFlagsArray = [ "-ldflags=-s -w -X main.gcsfuseVersion=${version}" ];
+  ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ];
 
   meta = with lib;{
     description = "A user-space file system for interacting with Google Cloud Storage";
diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix
index 552ea140d6089..6f5a6ec25fbb2 100644
--- a/pkgs/tools/misc/cloud-sql-proxy/default.nix
+++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  buildFlagsArray = [ "-ldflags=" "-X main.versionString=${version}" ];
+  ldflags = [ "-X main.versionString=${version}" ];
 
   meta = with lib; {
     description = "An authenticating proxy for Second Generation Google Cloud SQL databases";
diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix
index 496639ec07a58..6dfa3f2b77964 100644
--- a/pkgs/tools/misc/dashing/default.nix
+++ b/pkgs/tools/misc/dashing/default.nix
@@ -15,7 +15,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  buildFlagsArray = [ "-ldflags=-X main.version=${version}" ];
+  ldflags = [ "-X main.version=${version}" ];
 
   meta = with lib; {
     description = "A Dash Generator Script for Any HTML";
diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
index 2e2d8ccfc14f0..16594f898b97e 100644
--- a/pkgs/tools/misc/gh-ost/default.nix
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -13,7 +13,7 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/github/gh-ost";
 
-  buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version} -X main.BuildDescribe=${src.rev}" ];
+  ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" "-X main.BuildDescribe=${src.rev}" ];
 
   meta = with lib; {
     description = "Triggerless online schema migration solution for MySQL";
diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix
index 88d62b896df73..18f251fb72080 100644
--- a/pkgs/tools/misc/git-town/default.nix
+++ b/pkgs/tools/misc/git-town/default.nix
@@ -12,7 +12,7 @@ buildGoPackage rec {
     sha256 = "sha256-RmLDlTK+JO2KRLuLvO927W3WYdDlteBIpgTgDXh8lC8=";
   };
 
-  buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ];
+  ldflags = [ "-X github.com/git-town/git-town/src/cmd.version=v${version}" "-X github.com/git-town/git-town/src/cmd.buildDate=nix" ];
 
   meta = with lib; {
     description = "Generic, high-level git support for git-flow workflows";
@@ -21,4 +21,3 @@ buildGoPackage rec {
     license = licenses.mit;
   };
 }
-
diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix
index 03d8e58f8b02d..2453191d0cb83 100644
--- a/pkgs/tools/misc/systrayhelper/default.nix
+++ b/pkgs/tools/misc/systrayhelper/default.nix
@@ -16,13 +16,13 @@ buildGoPackage rec {
 
   # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178
   # > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time.
-  buildFlagsArray = [ ''-ldflags=
-    -X main.version=v${version}
-    -X main.commit=${rev}
-    -X main.date="nix-byrev"
-    -s
-    -w
-  '' ];
+  ldflags = [
+    "-X main.version=v${version}"
+    "-X main.commit=${rev}"
+    "-X main.date=nix-byrev"
+    "-s"
+    "-w"
+  ];
 
   nativeBuildInputs = [ pkg-config libappindicator-gtk3 ];
   buildInputs = [ libappindicator-gtk3 ];
diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix
index 6e67358b675a2..93384df9b42ed 100644
--- a/pkgs/tools/security/keycard-cli/default.nix
+++ b/pkgs/tools/security/keycard-cli/default.nix
@@ -17,8 +17,7 @@ buildGoPackage rec {
     sha256 = "sha256-ejFvduZs3eWc6efr9o4pXb6qw2QWWQTtkTxF80vOGNU=";
   };
 
-  buildFlagsArray = [
-    "-ldflags="
+  ldflags = [
     "-X main.version=${version}"
   ];
 
diff --git a/pkgs/tools/security/minica/default.nix b/pkgs/tools/security/minica/default.nix
index 49f1e2beb4db2..29574e39cd922 100644
--- a/pkgs/tools/security/minica/default.nix
+++ b/pkgs/tools/security/minica/default.nix
@@ -13,10 +13,9 @@ buildGoPackage rec {
     sha256 = "18518wp3dcjhf3mdkg5iwxqr3326n6jwcnqhyibphnb2a58ap7ny";
   };
 
-  buildFlagsArray = ''
-    -ldflags=
-      -X main.BuildVersion=${version}
-  '';
+  ldflags = [
+    "-X main.BuildVersion=${version}"
+  ];
 
   meta = with lib; {
     description = "A simple tool for generating self signed certificates";
diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix
index 943b86d3b051b..c937e6c7ab16e 100644
--- a/pkgs/tools/text/gucci/default.nix
+++ b/pkgs/tools/text/gucci/default.nix
@@ -15,9 +15,9 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  buildFlagsArray = ''
-    -ldflags=-X main.AppVersion=${version}
-  '';
+  ldflags = [
+    "-X main.AppVersion=${version}"
+  ];
 
   meta = with lib; {
     description = "A simple CLI templating tool written in golang";
@@ -27,4 +27,3 @@ buildGoPackage rec {
     platforms = platforms.unix;
   };
 }
-