Unverified Commit 6b30711c authored by hacker1024's avatar hacker1024 Committed by GitHub
Browse files

flutter: Install Android variant artifacts in platform subdirectories (#231296) 

* flutter: Allow installing artifacts in subdirectories

* flutter: Install Android variant artifacts in platform subdirectories
parent aaaebbf7

pkgs/development/compilers/flutter/engine-artifacts/default.nix

+10 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ let 
                variants = lib.genAttrs [ "profile" "release" ]

                  (variant: [

                    { archive = "artifacts.zip"; }

                    { archive = "${lib.toLower hostPlatform.uname.system}-x64.zip"; }

                    { subdirectory = true; archive = "${lib.toLower hostPlatform.uname.system}-x64.zip"; }

                  ]);

              })) //

          {
@@ -80,7 +80,7 @@ let 
      };

    };



  mkArtifactDerivation = { platform ? null, variant ? null, archive, ... }@args:

  mkArtifactDerivation = { platform ? null, variant ? null, subdirectory ? null, archive, ... }@args:

    let

      artifactDirectory = if platform == null then null else "${platform}${lib.optionalString (variant != null) "-${variant}"}";

      archiveBasename = lib.removeSuffix ".${(lib.last (lib.splitString "." archive))}" archive;
@@ -97,7 +97,14 @@ let 


      nativeBuildInputs = [ autoPatchelfHook ];



      installPhase = "cp -r . $out";

      installPhase =

        let

          destination = "$out/${if subdirectory == true then archiveBasename else if subdirectory != null then subdirectory else "."}";

        in

        ''

          mkdir -p "${destination}"

          cp -r . "${destination}"

        '';

    } // args);



  artifactDerivations = {