diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index a7b38916f72b..35d560d10204 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -341,6 +341,8 @@ let
         );
 
       attrs = finalAttrs: {
+        __structuredAttrs = true;
+
         pname = "godot${suffix}";
         inherit version;
 
@@ -645,7 +647,7 @@ let
           # when building the mono editor, we need to build the assemblies
           # before generating the bundle
           + lib.optionalString stdenv.hostPlatform.isDarwin ''
-            scons $sconsFlags generate_bundle=yes
+            scons "''${sconsFlags[@]}" generate_bundle=yes
           ''
         );
 
diff --git a/pkgs/development/tools/godot/export-templates-bin.nix b/pkgs/development/tools/godot/export-templates-bin.nix
index d6fe6890c281..642af51dc9e8 100644
--- a/pkgs/development/tools/godot/export-templates-bin.nix
+++ b/pkgs/development/tools/godot/export-templates-bin.nix
@@ -14,6 +14,8 @@
 # https://docs.godotengine.org/en/stable/tutorials/export/exporting_projects.html#export-templates
 let
   self = stdenvNoCC.mkDerivation {
+    __structuredAttrs = true;
+
     pname = "godot-export-templates${lib.optionalString withMono "-mono"}-bin";
     version = version;
 
@@ -26,6 +28,8 @@ let
       unzip
     ];
 
+    strictDeps = true;
+
     unpackPhase = ''
       runHook preUnpack
       unzip -q "$src"