Skip to content
This repository was archived by the owner on Jun 12, 2024. It is now read-only.

Commit 1476b67

Browse files
committed
fix(rust): cross compilation
1 parent 6c25032 commit 1476b67

File tree

1 file changed

+11
-19
lines changed

1 file changed

+11
-19
lines changed

rust/flake.nix

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@
3535
overlays = [ (final: prev: { ${packageName} = self.packages.${system}.${packageName}; }) ];
3636
};
3737

38-
fenixPkgsFor = pkgs: fenix.packages.${pkgs.system};
39-
fenixChannelFor =
40-
pkgs:
41-
(fenixPkgsFor pkgs).toolchainOf {
38+
fenixPkgs = fenix.packages.${pkgs.system};
39+
fenixChannel =
40+
fenixPkgs.toolchainOf {
4241
channel = "nightly";
4342
date =
4443
builtins.replaceStrings [ "nightly-" ] [ "" ]
@@ -48,10 +47,7 @@
4847

4948
toolchainFor =
5049
pkgs:
51-
let
52-
fenix-pkgs = fenixPkgsFor pkgs;
53-
in
54-
with fenix-pkgs;
50+
with fenixPkgs;
5551
combine [
5652
minimal.cargo
5753
minimal.rustc
@@ -86,8 +82,8 @@
8682
inherit
8783
system
8884
pkgs
89-
fenixPkgsFor
90-
fenixChannelFor
85+
fenixPkgs
86+
fenixChannel
9187
toolchainFor
9288
rustPlatformFor
9389
crossPackageFor
@@ -101,21 +97,18 @@
10197
packages = forSystems (
10298
{
10399
pkgs,
104-
fenixChannelFor,
100+
fenixChannel,
105101
system,
106102
crossPackageFor,
107103
...
108104
}:
109-
let
110-
fenix-channel = fenixChannelFor pkgs;
111-
in
112105
{
113106
${packageName} = pkgs.callPackage (./. + "/nix/packages/${packageName}.nix") {
114107
inherit cargoMeta;
115108
flake-self = self;
116109
rustPlatform = pkgs.makeRustPlatform {
117-
cargo = fenix-channel.toolchain;
118-
rustc = fenix-channel.toolchain;
110+
cargo = fenixChannel.toolchain;
111+
rustc = fenixChannel.toolchain;
119112
};
120113
};
121114
default = self.packages.${system}.${packageName};
@@ -128,10 +121,9 @@
128121
);
129122

130123
devShells = forSystems (
131-
{ pkgs, fenixChannelFor, ... }:
124+
{ pkgs, fenixChannel, ... }:
132125
let
133-
fenix-channel = fenixChannelFor pkgs;
134-
fenixRustToolchain = fenix-channel.withComponents [
126+
fenixRustToolchain = fenixChannel.withComponents [
135127
"cargo"
136128
"clippy-preview"
137129
"rust-src"

0 commit comments

Comments
 (0)