From 00a11274d4c4685d587bb8e13c17ceab1148a4ad Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 22 Oct 2023 18:21:00 +1100 Subject: [PATCH] flutter: Include patches in flutter_tools snapshot --- pkgs/development/compilers/flutter/flutter-tools.nix | 7 +++++++ pkgs/development/compilers/flutter/flutter.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix index 25e2cb3d670b..156cbf75588a 100644 --- a/pkgs/development/compilers/flutter/flutter-tools.nix +++ b/pkgs/development/compilers/flutter/flutter-tools.nix @@ -2,6 +2,7 @@ , dart , version , flutterSrc +, patches ? [ ] , pubspecLockFile , vendorHash , depsListFile @@ -14,6 +15,12 @@ buildDartApplication.override { inherit dart; } rec { src = flutterSrc; sourceRoot = "source/packages/flutter_tools"; + postUnpack = ''chmod -R u+w "$NIX_BUILD_TOP/source"''; + + inherit patches; + # The given patches are made for the entire SDK source tree. + prePatch = ''pushd "$NIX_BUILD_TOP/source"''; + postPatch = ''popd''; dartEntryPoints."flutter_tools.snapshot" = "bin/flutter_tools.dart"; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 3cc230b7b205..714876fdb1b2 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -18,6 +18,7 @@ let tools = callPackage ./flutter-tools.nix { inherit dart version; flutterSrc = src; + inherit patches; inherit pubspecLockFile vendorHash depsListFile; };