Commit 02a40a83 authored by qzylinra's avatar qzylinra
Browse files

flutter: remove rec

parent 08614021

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" ];

pkgs/development/compilers/flutter/default.nix

+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);

pkgs/development/compilers/flutter/flutter-tools.nix

+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