From 359449a284f9b227b8cf09b39bff64da144a0594 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 14 Jun 2022 19:04:48 +0800 Subject: [PATCH] buildGoApplication: warn if buildFlagsArray is used This is a port of https://github.com/NixOS/nixpkgs/commit/3360a376cb905ac40e77d5424089d4893e9cd157 --- builder/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/builder/default.nix b/builder/default.nix index 657fd8f..731b415 100644 --- a/builder/default.nix +++ b/builder/default.nix @@ -182,8 +182,9 @@ let , passthru ? { } , tags ? [ ] - # needed for buildFlags warning + # needed for buildFlags{,Array} warning , buildFlags ? "" + , buildFlagsArray ? "" , ... }@attrs: @@ -221,8 +222,9 @@ let inherit go modulesStruct localReplaceCommands defaultPackage; }; - package = lib.warnIf (buildFlags != "") - "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`" + package = + lib.warnIf (buildFlags != "" || buildFlagsArray != "") + "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`" stdenv.mkDerivation (lib.optionalAttrs (defaultPackage != "") { pname = attrs.pname or baseNameOf defaultPackage;