flutter: remove with lib and rec (#433311) (d32ba1a0) · Commits · nix / nixpkgs

pkgs/development/compilers/flutter/build-support/build-flutter-application.nix

+4 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ let
		++ flutterFlags;

		builderArgs =
		rec {
		let
		universal = args // {
		inherit flutterMode flutterFlags flutterBuildFlags;

		@@ -125,6 +125,9 @@ let
		fi
		'';
		};
		in
		{
		inherit universal;

		linux = universal // {
		outputs = universal.outputs or [ ] ++ [ "debug" ];

+1 −1

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

+15 −17

Original line number	Diff line number	Diff line
		@@ -347,15 +347,13 @@ stdenv.mkDerivation (finalAttrs: {
		dart = callPackage ./dart.nix { engine = finalAttrs.finalPackage; };
		};

		meta =
		with lib;
		{
		meta = {
		# Very broken on Darwin
		broken = stdenv.hostPlatform.isDarwin;
		description = "Flutter engine";
		homepage = "https://flutter.dev";
		maintainers = with maintainers; [ RossComputerGuy ];
		license = licenses.bsd3;
		maintainers = with lib.maintainers; [ RossComputerGuy ];
		license = lib.licenses.bsd3;
		platforms = [
		"x86_64-linux"
		"aarch64-linux"

+5 −4

Original line number	Diff line number	Diff line
		@@ -27,14 +27,16 @@ let
		content_hash = "1111111111111111111111111111111111111111";
		};
		};

		dartEntryPoints."flutter_tools.snapshot" = "bin/flutter_tools.dart";
		in
		buildDartApplication.override { inherit dart; } rec {
		buildDartApplication.override { inherit dart; } {
		pname = "flutter-tools";
		inherit version;
		inherit version dartEntryPoints;
		dartOutputType = "jit-snapshot";

		src = flutterSrc;
		sourceRoot = "${src.name}/packages/flutter_tools";
		sourceRoot = "${flutterSrc.name}/packages/flutter_tools";
		postUnpack = ''chmod -R u+w "$NIX_BUILD_TOP/source"'';

		inherit patches;
		@@ -69,7 +71,6 @@ buildDartApplication.override { inherit dart; } rec {
		ln -s '${dart}' "$FLUTTER_ROOT/bin/cache/dart-sdk"
		'';

		dartEntryPoints."flutter_tools.snapshot" = "bin/flutter_tools.dart";
		dartCompileFlags = [ "--define=NIX_FLUTTER_HOST_PLATFORM=${systemPlatform}" ];

		# The Dart wrapper launchers are useless for the Flutter tool - it is designed

+7 −7

Original line number	Diff line number	Diff line
		@@ -189,14 +189,14 @@ let
		inherit engine;
		};

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