forked from mirror/grapevine
remove uses of aliases
This commit is contained in:
parent
3b99032456
commit
6685f8cd14
3 changed files with 6 additions and 6 deletions
|
@ -49,7 +49,7 @@
|
|||
components = defaultProfileComponents ++
|
||||
toolchainFile.toolchain.components;
|
||||
targets = toolchainFile.toolchain.targets;
|
||||
fenix = inputs.fenix.packages.${pkgs.pkgsBuildHost.system};
|
||||
fenix = inputs.fenix.packages.${pkgs.stdenv.buildPlatform.system};
|
||||
in
|
||||
fenix.combine (builtins.map
|
||||
(target:
|
||||
|
|
|
@ -18,11 +18,11 @@ in
|
|||
options.services.grapevine = {
|
||||
enable = lib.mkEnableOption "grapevine";
|
||||
package = lib.mkPackageOption
|
||||
inputs.self.packages.${pkgs.system}
|
||||
inputs.self.packages.${pkgs.hostPlatform.system}
|
||||
"grapevine"
|
||||
{
|
||||
default = "default";
|
||||
pkgsText = "inputs.grapevine.packages.\${pkgs.system}";
|
||||
pkgsText = "inputs.grapevine.packages.\${pkgs.hostPlatform.system}";
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# Keep sorted
|
||||
{ default
|
||||
{ buildPlatform
|
||||
, default
|
||||
, engage
|
||||
, inputs
|
||||
, jq
|
||||
|
@ -7,7 +8,6 @@
|
|||
, markdownlint-cli
|
||||
, mdbook
|
||||
, mkShell
|
||||
, system
|
||||
, toolchain
|
||||
}:
|
||||
|
||||
|
@ -25,7 +25,7 @@ mkShell {
|
|||
#
|
||||
# This needs to come before `toolchain` in this list, otherwise
|
||||
# `$PATH` will have stable rustfmt instead.
|
||||
inputs.fenix.packages.${system}.latest.rustfmt
|
||||
inputs.fenix.packages.${buildPlatform.system}.latest.rustfmt
|
||||
|
||||
# Keep sorted
|
||||
engage
|
||||
|
|
Loading…
Reference in a new issue