phps: Clean up NIX_CFLAGS_COMPILE

concatenate all the flags from array and also move to `env` attribute
fossar · Jan 23, 2025 · c948675 · c948675
1 parent 249bd98
commit c948675
Showing 1 changed file with 26 additions and 10 deletions.
diff --git a/pkgs/phps.nix b/pkgs/phps.nix
@@ -95,16 +95,32 @@ let
               done
             ''
             + attrs.preConfigure;
-        }
-        // lib.optionalAttrs (prev.stdenv.cc.isClang) {
-          # Downgrade the following errors to warnings. `-Wint-conversion` only affects PHP 7.3.
-          NIX_CFLAGS_COMPILE =
-            (attrs.NIX_CFLAGS_COMPILE or "")
-            + lib.optionalString (lib.versionOlder args.version "8.2") " -Wno-compare-distinct-pointer-types -Wno-implicit-const-int-float-conversion -Wno-deprecated-declarations -Wno-incompatible-function-pointer-types -Wno-incompatible-pointer-types-discards-qualifiers"
-            + lib.optionalString (lib.versionOlder args.version "8.0") " -Wno-implicit-int -Wno-implicit-function-declaration"
-            + lib.optionalString (
-              lib.versionAtLeast args.version "7.3" && lib.versionOlder args.version "7.4"
-            ) " -Wno-int-conversion";
+
+          env =
+            let
+              extraCompileFlags = lib.optionals prev.stdenv.cc.isClang (
+                # Downgrade the following errors to warnings.
+                lib.optionals (lib.versionOlder args.version "8.2") [
+                  "-Wno-compare-distinct-pointer-types"
+                  "-Wno-implicit-const-int-float-conversion"
+                  "-Wno-deprecated-declarations"
+                  "-Wno-incompatible-function-pointer-types"
+                  "-Wno-incompatible-pointer-types-discards-qualifiers"
+                ]
+                ++ lib.optionals (lib.versionOlder args.version "8.0") [
+                  "-Wno-implicit-int"
+                  "-Wno-implicit-function-declaration"
+                ]
+                ++ lib.optionals (lib.versionAtLeast args.version "7.3" && lib.versionOlder args.version "7.4") [
+                  "-Wno-int-conversion"
+                ]
+              );
+            in
+            attrs.env or { }
+            // lib.optionalAttrs (extraCompileFlags != [ ]) {
+              NIX_CFLAGS_COMPILE =
+                (attrs.env.NIX_CFLAGS_COMPILE or "") + lib.concatStringsSep " " extraCompileFlags;
+            };
         };
 
       # For passing libxml2 and pcre2 to php-packages.nix.