alihan/himalaya-mail-cli
1
0
Fork 0
mirror of https://github.com/pimalaya/himalaya.git synced 2024-12-09 21:18:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

bad

Browse Source
This commit is contained in:
Clément DOUIN
2024-11-26 09:08:13 +01:00
parent b4f337ea0d
commit 8f9e016936
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@@ -28,7 +28,7 @@ let
rustToolchain = mkToolchain.fromTarget {
inherit lib;
targetSystem = if isNull system then null else system.rustTarget;
target = if isNull system then null else system.rustTarget;
};
rustPlatform = pkgs.makeRustPlatform {

13
rust-toolchain.nix
View File

@@ -17,14 +17,19 @@ rec {
armv7l-unknown-linux-musleabihf = "armv7-unknown-linux-musleabihf";
}.${target} or target;
fromTarget = { lib, targetSystem ? null }:
crossRustStd = name: target:
let
rustTarget = toRustTarget target;
crossToolchain = fenix.targets.${rustTarget}.fromToolchainName { inherit name sha256; };
in
crossToolchain.rust-std;
fromTarget = { lib, target ? null }:
let
name = (lib.importTOML file).toolchain.channel;
toolchain = fenix.fromToolchainName { inherit name sha256; };
target = if isNull targetSystem then null else toRustTarget targetSystem;
components = [ toolchain.rustc toolchain.cargo ]
++ lib.optional (!isNull target) (fenix.targets.${target}.fromToolchainName { inherit name sha256; }.rust-std);
++ lib.optional (!isNull target) (crossRustStd name target);
in
fenix.combine components;
}