lol

flutter: remove rec

qzylinra 02a40a83 08614021

+10 -6
+4 -1
pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
··· 39 39 ++ flutterFlags; 40 40 41 41 builderArgs = 42 - rec { 42 + let 43 43 universal = args // { 44 44 inherit flutterMode flutterFlags flutterBuildFlags; 45 45 ··· 125 125 fi 126 126 ''; 127 127 }; 128 + in 129 + { 130 + inherit universal; 128 131 129 132 linux = universal // { 130 133 outputs = universal.outputs or [ ] ++ [ "debug" ];
+1 -1
pkgs/development/compilers/flutter/default.nix
··· 96 96 in 97 97 (mkCustomFlutter args).overrideAttrs ( 98 98 prev: next: { 99 - passthru = next.passthru // rec { 99 + passthru = next.passthru // { 100 100 inherit wrapFlutter mkCustomFlutter mkFlutter; 101 101 buildFlutterApplication = callPackage ./build-support/build-flutter-application.nix { 102 102 flutter = wrapFlutter (mkCustomFlutter args);
+5 -4
pkgs/development/compilers/flutter/flutter-tools.nix
··· 27 27 content_hash = "1111111111111111111111111111111111111111"; 28 28 }; 29 29 }; 30 + 31 + dartEntryPoints."flutter_tools.snapshot" = "bin/flutter_tools.dart"; 30 32 in 31 - buildDartApplication.override { inherit dart; } rec { 33 + buildDartApplication.override { inherit dart; } { 32 34 pname = "flutter-tools"; 33 - inherit version; 35 + inherit version dartEntryPoints; 34 36 dartOutputType = "jit-snapshot"; 35 37 36 38 src = flutterSrc; 37 - sourceRoot = "${src.name}/packages/flutter_tools"; 39 + sourceRoot = "${flutterSrc.name}/packages/flutter_tools"; 38 40 postUnpack = ''chmod -R u+w "$NIX_BUILD_TOP/source"''; 39 41 40 42 inherit patches; ··· 69 71 ln -s '${dart}' "$FLUTTER_ROOT/bin/cache/dart-sdk" 70 72 ''; 71 73 72 - dartEntryPoints."flutter_tools.snapshot" = "bin/flutter_tools.dart"; 73 74 dartCompileFlags = [ "--define=NIX_FLUTTER_HOST_PLATFORM=${systemPlatform}" ]; 74 75 75 76 # The Dart wrapper launchers are useless for the Flutter tool - it is designed