talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

flutter: remove with lib and rec (#433311)

Browse Source
This commit is contained in:
Yohann Boniface 2025-08-14 10:52:27 +02:00 committed by GitHub
commit d32ba1a0cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
View File

@ -39,7 +39,7 @@ let
++ flutterFlags; ++ flutterFlags;
builderArgs = builderArgs =
rec { let
universal = args // { universal = args // {
inherit flutterMode flutterFlags flutterBuildFlags; inherit flutterMode flutterFlags flutterBuildFlags;
@ -125,6 +125,9 @@ let
fi fi
''; '';
}; };
in
{
inherit universal;
linux = universal // { linux = universal // {
outputs = universal.outputs or [ ] ++ [ "debug" ]; outputs = universal.outputs or [ ] ++ [ "debug" ];

2
pkgs/development/compilers/flutter/default.nix
View File

@ -96,7 +96,7 @@ let
in in
(mkCustomFlutter args).overrideAttrs ( (mkCustomFlutter args).overrideAttrs (
prev: next: { prev: next: {
passthru = next.passthru // rec { passthru = next.passthru // {
inherit wrapFlutter mkCustomFlutter mkFlutter; inherit wrapFlutter mkCustomFlutter mkFlutter;
buildFlutterApplication = callPackage ./build-support/build-flutter-application.nix { buildFlutterApplication = callPackage ./build-support/build-flutter-application.nix {
flutter = wrapFlutter (mkCustomFlutter args); flutter = wrapFlutter (mkCustomFlutter args);

8
pkgs/development/compilers/flutter/engine/package.nix
View File

@ -347,15 +347,13 @@ stdenv.mkDerivation (finalAttrs: {
dart = callPackage ./dart.nix { engine = finalAttrs.finalPackage; }; dart = callPackage ./dart.nix { engine = finalAttrs.finalPackage; };
}; };
meta = meta = {
with lib;
{
# Very broken on Darwin # Very broken on Darwin
broken = stdenv.hostPlatform.isDarwin; broken = stdenv.hostPlatform.isDarwin;
description = "Flutter engine"; description = "Flutter engine";
homepage = "https://flutter.dev"; homepage = "https://flutter.dev";
maintainers = with maintainers; [ RossComputerGuy ]; maintainers = with lib.maintainers; [ RossComputerGuy ];
license = licenses.bsd3; license = lib.licenses.bsd3;
platforms = [ platforms = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"

9
pkgs/development/compilers/flutter/flutter-tools.nix
View File

@ -27,14 +27,16 @@ let
content_hash = "1111111111111111111111111111111111111111"; content_hash = "1111111111111111111111111111111111111111";
}; };
}; };
dartEntryPoints."flutter_tools.snapshot" = "bin/flutter_tools.dart";
in in
buildDartApplication.override { inherit dart; } rec { buildDartApplication.override { inherit dart; } {
pname = "flutter-tools"; pname = "flutter-tools";
inherit version; inherit version dartEntryPoints;
dartOutputType = "jit-snapshot"; dartOutputType = "jit-snapshot";
src = flutterSrc; src = flutterSrc;
sourceRoot = "${src.name}/packages/flutter_tools"; sourceRoot = "${flutterSrc.name}/packages/flutter_tools";
postUnpack = ''chmod -R u+w "$NIX_BUILD_TOP/source"''; postUnpack = ''chmod -R u+w "$NIX_BUILD_TOP/source"'';
inherit patches; inherit patches;
@ -69,7 +71,6 @@ buildDartApplication.override { inherit dart; } rec {
ln -s '${dart}' "$FLUTTER_ROOT/bin/cache/dart-sdk" ln -s '${dart}' "$FLUTTER_ROOT/bin/cache/dart-sdk"
''; '';
dartEntryPoints."flutter_tools.snapshot" = "bin/flutter_tools.dart";
dartCompileFlags = [ "--define=NIX_FLUTTER_HOST_PLATFORM=${systemPlatform}" ]; dartCompileFlags = [ "--define=NIX_FLUTTER_HOST_PLATFORM=${systemPlatform}" ];
# The Dart wrapper launchers are useless for the Flutter tool - it is designed # The Dart wrapper launchers are useless for the Flutter tool - it is designed

14
pkgs/development/compilers/flutter/flutter.nix
View File

@ -189,14 +189,14 @@ let
inherit engine; inherit engine;
}; };
meta = with lib; { meta = {
description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; description = "Makes it easy and fast to build beautiful apps for mobile and beyond";
longDescription = '' longDescription = ''
Flutter is Google’s UI toolkit for building beautiful, Flutter is Google's SDK for crafting beautiful,
natively compiled applications for mobile, web, and desktop from a single codebase. fast user experiences for mobile, web, and desktop from a single codebase.
''; '';
homepage = "https://flutter.dev"; homepage = "https://flutter.dev";
license = licenses.bsd3; license = lib.licenses.bsd3;
platforms = [ platforms = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
@ -204,10 +204,10 @@ let
"aarch64-darwin" "aarch64-darwin"
]; ];
mainProgram = "flutter"; mainProgram = "flutter";
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
ericdallo ericdallo
]; ];
teams = [ teams.flutter ]; teams = [ lib.teams.flutter ];
}; };
}; };
in in