dart: use dart-source in linux (#492235)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -12512,7 +12512,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
|
||||
({
|
||||
@@ -12521,6 +12526,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 { };
|
||||
|
||||
Reference in New Issue
Block a user