pyrox.dev
`buildGoModule`: remove `buildFlags`/`buildFlagsArray` (#349487)
authored by Paul Meyer and committed by GitHub 09704d31 957aa4d9
+3
-12
pkgs/build-support/go/module.nix
+3
-12
pkgs/build-support/go/module.nix
···
54
54
# Go build flags.
55
55
, GOFLAGS ? [ ]
56
56
57
-
# Needed for buildFlags{,Array} warning
58
-
, buildFlags ? "" # deprecated
59
-
, buildFlagsArray ? "" # deprecated
60
-
61
57
, ...
62
58
}@args':
63
59
···
213
209
'');
214
210
215
211
buildPhase = args.buildPhase or (
216
-
lib.warnIf (buildFlags != "" || buildFlagsArray != "")
217
-
"`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"
218
212
lib.warnIf (builtins.elem "-buildid=" ldflags)
219
213
"`-buildid=` is set by default as ldflag by buildGoModule"
220
214
''
···
232
226
buildGoDir() {
233
227
local cmd="$1" dir="$2"
234
228
235
-
declare -ga buildFlagsArray
236
229
declare -a flags
237
-
flags+=($buildFlags "''${buildFlagsArray[@]}")
238
230
flags+=(''${tags:+-tags=''${tags// /,}})
239
231
flags+=(''${ldflags:+-ldflags="$ldflags"})
240
232
flags+=("-p" "$NIX_BUILD_CORES")
233
+
if (( "''${NIX_DEBUG:-0}" >= 1 )); then
234
+
flags+=(-x)
235
+
fi
241
236
242
237
if [ "$cmd" = "test" ]; then
243
238
flags+=(-vet=off)
···
266
261
find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique | grep -v "$exclude"
267
262
fi
268
263
}
269
-
270
-
if (( "''${NIX_DEBUG:-0}" >= 1 )); then
271
-
buildFlagsArray+=(-x)
272
-
fi
273
264
274
265
if [ -z "$enableParallelBuilding" ]; then
275
266
export NIX_BUILD_CORES=1