From af6e82b47a76d6d14ba71c03537c6d034c85b647 Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Thu, 26 Oct 2023 15:41:10 +1100
Subject: [PATCH] flutter.buildFlutterApplication: Use extraPackageConfigSetup

---
 pkgs/build-support/flutter/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix
index 924491b65c77..2d05ac4297b6 100644
--- a/pkgs/build-support/flutter/default.nix
+++ b/pkgs/build-support/flutter/default.nix
@@ -68,6 +68,17 @@
     '';
   };
 
+  extraPackageConfigSetup = ''
+    # https://github.com/flutter/flutter/blob/3.13.8/packages/flutter_tools/lib/src/dart/pub.dart#L755
+    if [ "$(yq '.flutter.generate // false' pubspec.yaml)" = "true" ]; then
+      jq '.packages |= . + [{
+        name: "flutter_gen",
+        rootUri: "flutter_gen",
+        languageVersion: "2.12",
+      }]' "$out" | '${moreutils}/bin/sponge' "$out"
+    fi
+  '';
+
   nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ wrapGAppsHook jq yq moreutils ];
   buildInputs = (args.buildInputs or [ ]) ++ [ glib ];
 
@@ -77,15 +88,6 @@
 
     mkdir -p build/flutter_assets/fonts
 
-    # https://github.com/flutter/flutter/blob/3.13.8/packages/flutter_tools/lib/src/dart/pub.dart#L755
-    if [ "$(yq '.flutter.generate // false' pubspec.yaml)" = "true" ]; then
-      jq '.packages |= . + [{
-        name: "flutter_gen",
-        rootUri: "flutter_gen",
-        languageVersion: "2.12",
-      }]' .dart_tool/package_config.json | sponge .dart_tool/package_config.json
-    fi
-
     flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") flutterBuildFlags)}
 
     runHook postBuild