nix: override rustPlatform instead of using makeRustPlatform
This commit is contained in:
parent
5cafe9d92b
commit
65565a4205
2 changed files with 6 additions and 7 deletions
|
@ -33,8 +33,10 @@
|
||||||
packages.default =
|
packages.default =
|
||||||
let rust-bin = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal);
|
let rust-bin = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal);
|
||||||
in pkgs.callPackage ./package.nix {
|
in pkgs.callPackage ./package.nix {
|
||||||
cargo = rust-bin;
|
rustPlatform = pkgs.makeRustPlatform {
|
||||||
rustc = rust-bin;
|
rustc = rust-bin;
|
||||||
|
cargo = rust-bin;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
{ makeRustPlatform
|
{ rustPlatform
|
||||||
, cargo
|
|
||||||
, rustc
|
|
||||||
|
|
||||||
# Runtime Deps
|
# Runtime Deps
|
||||||
, sqlite
|
, sqlite
|
||||||
|
@ -10,8 +8,7 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let rustPlatform = makeRustPlatform { inherit cargo rustc; };
|
rustPlatform.buildRustPackage {
|
||||||
in rustPlatform.buildRustPackage {
|
|
||||||
pname = "nyazoom";
|
pname = "nyazoom";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue