From e6494966dd6a8dcd6d4cb5663f093a57bcc2593e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 26 Aug 2021 13:31:57 +1000
Subject: treewide: buildFlagsArray -> ldflags

---
 pkgs/applications/misc/cointop/default.nix              |  2 +-
 pkgs/applications/networking/cluster/argo/default.nix   | 17 ++++++++---------
 pkgs/applications/networking/cluster/kops/default.nix   |  9 ++++-----
 .../networking/cluster/kube-router/default.nix          | 11 ++++-------
 .../networking/cluster/kubeless/default.nix             |  6 +++---
 .../networking/cluster/minishift/default.nix            | 11 +++++------
 .../applications/version-management/git-lfs/default.nix |  2 +-
 .../applications/virtualization/docker-slim/default.nix |  9 ++++-----
 .../virtualization/nvidia-container-runtime/default.nix |  2 +-
 9 files changed, 31 insertions(+), 38 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix
index 62bcf6a99d2b9..4b2f45c47f4f1 100644
--- a/pkgs/applications/misc/cointop/default.nix
+++ b/pkgs/applications/misc/cointop/default.nix
@@ -13,7 +13,7 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/miguelmota/cointop";
 
-  buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cointop.version=${version}" ];
+  ldflags = [ "-s" "-w" "-X ${goPackagePath}/cointop.version=${version}" ];
 
   meta = with lib; {
     description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies";
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index a49879e535284..6372f19ee6c72 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -43,15 +43,14 @@ buildGoModule rec {
     ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app
   '';
 
-  buildFlagsArray = ''
-    -ldflags=
-      -s -w
-      -X github.com/argoproj/argo-workflows/v3.buildDate=unknown
-      -X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}
-      -X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}
-      -X github.com/argoproj/argo-workflows/v3.gitTreeState=clean
-      -X github.com/argoproj/argo-workflows/v3.version=${version}
-  '';
+  ldflags = [
+    "-s" "-w"
+    "-X github.com/argoproj/argo-workflows/v3.buildDate=unknown"
+    "-X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}"
+    "-X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}"
+    "-X github.com/argoproj/argo-workflows/v3.gitTreeState=clean"
+    "-X github.com/argoproj/argo-workflows/v3.version=${version}"
+  ];
 
   postInstall = ''
     for shell in bash zsh; do
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 54d13f819ab87..389be11e506cc 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -21,11 +21,10 @@ let
         nativeBuildInputs = [ go-bindata installShellFiles ];
         subPackages = [ "cmd/kops" ];
 
-        buildFlagsArray = ''
-          -ldflags=
-              -X k8s.io/kops.Version=${version}
-              -X k8s.io/kops.GitVersion=${version}
-        '';
+        ldflags = [
+          "-X k8s.io/kops.Version=${version}"
+          "-X k8s.io/kops.GitVersion=${version}"
+        ];
 
         preBuild = ''
           (cd go/src/k8s.io/kops
diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix
index 85b83c994df88..b9a282b5cd161 100644
--- a/pkgs/applications/networking/cluster/kube-router/default.nix
+++ b/pkgs/applications/networking/cluster/kube-router/default.nix
@@ -13,13 +13,10 @@ buildGoPackage rec {
     sha256 = "sha256-/VToLQexvRtcBU+k8WnGEcfLfxme/hgRnhU8723BEFU=";
   };
 
-  buildFlagsArray = ''
-    -ldflags=
-    -X
-    ${goPackagePath}/pkg/cmd.version=${version}
-    -X
-    ${goPackagePath}/pkg/cmd.buildDate=Nix
-  '';
+  ldflags = [
+    "-X ${goPackagePath}/pkg/cmd.version=${version}"
+    "-X ${goPackagePath}/pkg/cmd.buildDate=Nix"
+  ];
 
   meta = with lib; {
     homepage = "https://www.kube-router.io/";
diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix
index 38323b98b1943..537fb611783ea 100644
--- a/pkgs/applications/networking/cluster/kubeless/default.nix
+++ b/pkgs/applications/networking/cluster/kubeless/default.nix
@@ -17,9 +17,9 @@ buildGoPackage rec {
 
   subPackages = [ "cmd/kubeless" ];
 
-  buildFlagsArray = ''
-    -ldflags=-s -w -X github.com/kubeless/kubeless/pkg/version.Version=${version}
-  '';
+  ldflags = [
+    "-s" "-w" "-X github.com/kubeless/kubeless/pkg/version.Version=${version}"
+  ];
 
   postInstall = ''
     for shell in bash; do
diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index 5b3b17b3df201..488d0c4327a26 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -34,12 +34,11 @@ in buildGoPackage rec {
       --replace '"runtime"' ""
   '';
 
-  buildFlagsArray = ''
-    -ldflags=
-      -X ${goPackagePath}/pkg/version.minishiftVersion=${version}
-      -X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}
-      -X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}
-  '';
+  ldflags = [
+    "-X ${goPackagePath}/pkg/version.minishiftVersion=${version}"
+    "-X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}"
+    "-X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}"
+  ];
 
   preBuild = ''
     (cd go/src/github.com/minishift/minishift
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 5976f1de6a76a..77a8d9d897f1c 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -15,7 +15,7 @@ buildGoPackage rec {
 
   nativeBuildInputs = [ ronn installShellFiles ];
 
-  buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/config.Vendor=${version} -X ${goPackagePath}/config.GitCommit=${src.rev}" ];
+  ldflags = [ "-s" "-w" "-X ${goPackagePath}/config.Vendor=${version}" "-X ${goPackagePath}/config.GitCommit=${src.rev}" ];
 
   subPackages = [ "." ];
 
diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index 6e6db87a6cf83..a38b0675af2d7 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -23,11 +23,10 @@ buildGoPackage rec {
     makeWrapper
   ];
 
-  buildFlagsArray = [
-    ''-ldflags=
-        -s -w -X ${goPackagePath}/pkg/version.appVersionTag=${version}
-              -X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}
-    ''
+  ldflags = [
+    "-s" "-w"
+    "-X ${goPackagePath}/pkg/version.appVersionTag=${version}"
+    "-X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}"
   ];
 
   # docker-slim tries to create its state dir next to the binary (inside the nix
diff --git a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix
index 92717b988919b..43eb1639b43e5 100644
--- a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix
+++ b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix
@@ -35,7 +35,7 @@ buildGoPackage rec {
   };
 
   goPackagePath = "github.com/${pname}/src";
-  buildFlagsArray = [ "-ldflags=" "-s -w" ];
+  ldflags = [ "-s" "-w" ];
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
-- 
cgit 1.4.1