From 9a2382c7f43ceedfe20e3e16cb7def6a7fc0e10c Mon Sep 17 00:00:00 2001 From: kyehn Date: Fri, 20 Feb 2026 04:55:22 +0800 Subject: [PATCH] dart: use dart-source in linux --- pkgs/development/compilers/dart/source/default.nix | 6 +++--- pkgs/development/compilers/flutter/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 9 ++++++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/dart/source/default.nix b/pkgs/development/compilers/dart/source/default.nix index 135bb642370c..446229e0c523 100644 --- a/pkgs/development/compilers/dart/source/default.nix +++ b/pkgs/development/compilers/dart/source/default.nix @@ -4,7 +4,7 @@ callPackage, cacert, curlMinimal, - dart, + dart-bin, debug ? false, fetchurl, gn, @@ -126,7 +126,7 @@ let cp --recursive sdk $out ''; in -dart.overrideAttrs (oldAttrs: { +dart-bin.overrideAttrs (oldAttrs: { inherit version src; nativeBuildInputs = [ @@ -172,7 +172,7 @@ dart.overrideAttrs (oldAttrs: { export PATH=$PWD/.bin-tools:$PATH '' + '' - ln --symbolic ${buildPackages.dart} tools/sdks/dart-sdk + ln --symbolic ${buildPackages.dart-bin} tools/sdks/dart-sdk ln --symbolic --force ${lib.getExe buildPackages.gn} buildtools/gn mkdir --parents buildtools/ninja ln --symbolic --force ${lib.getExe buildPackages.samurai} buildtools/ninja/ninja diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index f7461b01739d..2c886bf529fc 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -4,6 +4,7 @@ fetchzip, fetchFromGitHub, dart, + dart-bin, lib, stdenv, runCommand, @@ -57,14 +58,14 @@ let in ( if lib.versionAtLeast version "3.41" then - (dart.overrideAttrs (oldAttrs: { + (dart-bin.overrideAttrs (oldAttrs: { version = dartVersion; src = oldAttrs.src.overrideAttrs (_: { inherit hash; }); })) else - (dart.overrideAttrs (_: { + (dart-bin.overrideAttrs (_: { # This overrideAttrs is used to replace the version in src.url version = dartVersion; __intentionallyOverridingVersion = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70ef90e6905b..e466b79c9cfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12709,7 +12709,12 @@ with pkgs; zncModules = recurseIntoAttrs (callPackage ../applications/networking/znc/modules.nix { }); - dart = callPackage ../development/compilers/dart { }; + inherit + ({ + dart-bin = callPackage ../development/compilers/dart { }; + }) + dart-bin + ; inherit ({ @@ -12718,6 +12723,8 @@ with pkgs; dart-source ; + dart = if stdenv.hostPlatform.isLinux then dart-source else dart-bin; + pub2nix = recurseIntoAttrs (callPackage ../build-support/dart/pub2nix { }); buildDartApplication = callPackage ../build-support/dart/build-dart-application { };