lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

flutter: revert remove usages of aliases {build,host,target}Platform

PR #350299 broke Flutter's update script with how it handled getting the
platform. Furthermore, the problem was made worse in the last update to
Flutter which had to work around that problem. We'll just revert it for
now and do a proper fix once we can figure out how to satify setting the
different platforms without causing any more problems.

+34 -24
+11 -1
pkgs/development/compilers/flutter/engine/package.nix
··· 6 6 darwin, 7 7 clang, 8 8 llvm, 9 - tools ? callPackage ./tools.nix { }, 9 + tools ? callPackage ./tools.nix { 10 + inherit (stdenv) 11 + hostPlatform 12 + buildPlatform 13 + ; 14 + }, 10 15 stdenv, 11 16 stdenvNoCC, 12 17 dart, ··· 62 67 version 63 68 hashes 64 69 url 70 + ; 71 + inherit (stdenv) 72 + hostPlatform 73 + buildPlatform 74 + targetPlatform 65 75 ; 66 76 }; 67 77
+10 -9
pkgs/development/compilers/flutter/engine/source.nix
··· 1 1 { 2 - stdenv, 3 2 lib, 4 3 callPackage, 5 4 fetchgit, ··· 15 14 version, 16 15 hashes, 17 16 url, 17 + hostPlatform, 18 + targetPlatform, 19 + buildPlatform, 18 20 }@pkgs: 19 21 let 20 - target-constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; }; 21 - build-constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; }; 22 - tools = pkgs.tools or (callPackage ./tools.nix { }); 22 + target-constants = callPackage ./constants.nix { platform = targetPlatform; }; 23 + build-constants = callPackage ./constants.nix { platform = buildPlatform; }; 24 + tools = pkgs.tools or (callPackage ./tools.nix { inherit hostPlatform buildPlatform; }); 23 25 24 26 boolOption = value: if value then "True" else "False"; 25 27 in 26 - runCommand 27 - "flutter-engine-source-${version}-${stdenv.buildPlatform.system}-${stdenv.targetPlatform.system}" 28 + runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPlatform.system}" 28 29 { 29 30 pname = "flutter-engine-source"; 30 31 inherit version; ··· 52 53 "custom_vars": { 53 54 "download_fuchsia_deps": False, 54 55 "download_android_deps": False, 55 - "download_linux_deps": ${boolOption stdenv.targetPlatform.isLinux}, 56 + "download_linux_deps": ${boolOption targetPlatform.isLinux}, 56 57 "setup_githooks": False, 57 58 "download_esbuild": False, 58 59 "download_dart_sdk": False, ··· 82 83 outputHashAlgo = "sha256"; 83 84 outputHashMode = "recursive"; 84 85 outputHash = 85 - (hashes."${stdenv.buildPlatform.system}" or { })."${stdenv.targetPlatform.system}" 86 - or (throw "Hash not set for ${stdenv.targetPlatform.system} on ${stdenv.buildPlatform.system}"); 86 + (hashes."${buildPlatform.system}" or { })."${targetPlatform.system}" 87 + or (throw "Hash not set for ${targetPlatform.system} on ${buildPlatform.system}"); 87 88 } 88 89 '' 89 90 source ${../../../../build-support/fetchgit/deterministic-git}
+4 -2
pkgs/development/compilers/flutter/engine/tools.nix
··· 1 1 { 2 2 stdenv, 3 + buildPlatform, 4 + hostPlatform, 3 5 callPackage, 4 6 fetchgit, 5 7 fetchurl, ··· 29 31 }, 30 32 }: 31 33 let 32 - constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; }; 33 - host-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; }; 34 + constants = callPackage ./constants.nix { platform = buildPlatform; }; 35 + host-constants = callPackage ./constants.nix { platform = hostPlatform; }; 34 36 stdenv-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; }; 35 37 in 36 38 {
+3 -6
pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
··· 17 17 ++ (map 18 18 (targetPlatform: 19 19 callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" { 20 - stdenv = stdenv.override { 21 - targetPlatform = lib.systems.elaborate targetPlatform; 22 - hostPlatform = lib.systems.elaborate buildPlatform; 23 - buildPlatform = lib.systems.elaborate buildPlatform; 24 - }; 25 - 20 + targetPlatform = lib.systems.elaborate targetPlatform; 21 + hostPlatform = lib.systems.elaborate buildPlatform; 22 + buildPlatform = lib.systems.elaborate buildPlatform; 26 23 flutterVersion = version; 27 24 version = engineVersion; 28 25 url = "https://github.com/flutter/engine.git@${engineVersion}";
+2 -2
pkgs/development/compilers/flutter/versions/3_24/data.json
··· 10 10 "x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=" 11 11 }, 12 12 "x86_64-linux": { 13 - "aarch64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=", 14 - "x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=" 13 + "aarch64-linux": "sha256-aQK3uD8n/V1ZH5+RbCNVZ1Fxx0Z33y5IEG4B0MVKh58=", 14 + "x86_64-linux": "sha256-aQK3uD8n/V1ZH5+RbCNVZ1Fxx0Z33y5IEG4B0MVKh58=" 15 15 } 16 16 }, 17 17 "dartVersion": "3.5.4",
+2 -2
pkgs/development/compilers/flutter/versions/3_26/data.json
··· 10 10 "x86_64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=" 11 11 }, 12 12 "x86_64-linux": { 13 - "aarch64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=", 14 - "x86_64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=" 13 + "aarch64-linux": "sha256-deuArmKBZvkjjt986wAAwGArKYMW01QvbgqzQ9FLBS8=", 14 + "x86_64-linux": "sha256-deuArmKBZvkjjt986wAAwGArKYMW01QvbgqzQ9FLBS8=" 15 15 } 16 16 }, 17 17 "dartVersion": "3.6.0-216.1.beta",
+2 -2
pkgs/development/compilers/flutter/versions/3_27/data.json
··· 10 10 "x86_64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=" 11 11 }, 12 12 "x86_64-linux": { 13 - "aarch64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=", 14 - "x86_64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=" 13 + "aarch64-linux": "sha256-YFmK7eSt9lK/iEMPC5jxp5Vf2pnDjUDyPVoHzgxc8mA=", 14 + "x86_64-linux": "sha256-YFmK7eSt9lK/iEMPC5jxp5Vf2pnDjUDyPVoHzgxc8mA=" 15 15 } 16 16 }, 17 17 "dartVersion": "3.6.0-334.3.beta",