lol

Merge pull request #134925 from qowoz/go-buildflags

authored by

Sandro and committed by
GitHub
57547596 c7ad6b31

+18 -22
+1 -1
pkgs/applications/networking/cluster/docker-machine/xhyve.nix
··· 17 17 export CGO_CFLAGS=-I$(pwd)/go/src/${goPackagePath}/vendor/github.com/jceel/lib9p 18 18 export CGO_LDFLAGS=$(pwd)/go/src/${goPackagePath}/vendor/build/lib9p/lib9p.a 19 19 ''; 20 - buildFlags = "--tags lib9p"; 20 + tags = [ "lib9p" ]; 21 21 22 22 src = fetchFromGitHub { 23 23 rev = "v${version}";
+7 -7
pkgs/applications/networking/cluster/kubebuilder/default.nix
··· 20 20 21 21 subPackages = ["cmd"]; 22 22 23 - preBuild = '' 24 - export buildFlagsArray+=("-ldflags=-X main.kubeBuilderVersion=v${version} \ 25 - -X main.goos=$GOOS \ 26 - -X main.goarch=$GOARCH \ 27 - -X main.gitCommit=v${version} \ 28 - -X main.buildDate=v${version}") 29 - ''; 23 + ldflags = [ 24 + "-X main.kubeBuilderVersion=v${version}" 25 + "-X main.goos=${go.GOOS}" 26 + "-X main.goarch=${go.GOARCH}" 27 + "-X main.gitCommit=v${version}" 28 + "-X main.buildDate=v${version}" 29 + ]; 30 30 31 31 doCheck = true; 32 32
+3 -3
pkgs/applications/terminal-emulators/aminal/default.nix
··· 33 33 sha256 = "0syv9md7blnl6i19zf8s1xjx5vfz6s755fxyg2ply0qc1pwhsj8n"; 34 34 }; 35 35 36 - preBuild = '' 37 - buildFlagsArray=("-ldflags=-X ${goPackagePath}/version.Version=${version}") 38 - ''; 36 + ldflags = [ 37 + "-X ${goPackagePath}/version.Version=${version}" 38 + ]; 39 39 40 40 meta = with lib; { 41 41 description = "Golang terminal emulator from scratch";
+4 -6
pkgs/development/tools/kubeprompt/default.nix
··· 11 11 sha256 = "1a0xi31bd7n2zrx2z4srhvixlbj028h63dlrjzqxgmgn2w6akbz2"; 12 12 }; 13 13 14 - preBuild = '' 15 - export buildFlagsArray+=( 16 - "-ldflags= 17 - -w -s 18 - -X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}") 19 - ''; 14 + ldflags = [ 15 + "-w" "-s" 16 + "-X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}" 17 + ]; 20 18 21 19 vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi"; 22 20
+3 -5
pkgs/servers/monitoring/alertmanager-bot/default.nix
··· 17 17 sed "s;/templates/default.tmpl;$out/share&;" -i cmd/alertmanager-bot/main.go 18 18 ''; 19 19 20 - preBuild = '' 21 - export buildFlagsArray=( 22 - "-ldflags=-s -w -X main.Version=v${version} -X main.Revision=${src.rev}" 23 - ) 24 - ''; 20 + ldflags = [ 21 + "-s" "-w" "-X main.Version=v${version}" "-X main.Revision=${src.rev}" 22 + ]; 25 23 26 24 postInstall = '' 27 25 install -Dm644 -t $out/share/templates $src/default.tmpl