Merge pull request #141 from msfjarvis/main
fix: replace `pkgs.system` with `pkgs.stdenv.hostPlatform.system`
This commit is contained in:
commit
cfeacd0555
5 changed files with 6 additions and 6 deletions
|
|
@ -51,6 +51,6 @@ in {
|
|||
aliased-checks = mapAttrs (name: value: checks-without-aliases.${value}) alias;
|
||||
checks = checks-without-aliases // aliased-checks // overrides;
|
||||
in
|
||||
filterPackages pkgs.system checks;
|
||||
filterPackages pkgs.stdenv.hostPlatform.system checks;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ in {
|
|||
extra-special-args-module = args @ {
|
||||
config,
|
||||
pkgs,
|
||||
system ? pkgs.system,
|
||||
system ? pkgs.stdenv.hostPlatform.system,
|
||||
target ? system,
|
||||
format ? "home",
|
||||
host ? "",
|
||||
|
|
@ -297,7 +297,7 @@ in {
|
|||
options,
|
||||
pkgs,
|
||||
host ? "",
|
||||
system ? pkgs.system,
|
||||
system ? pkgs.stdenv.hostPlatform.system,
|
||||
...
|
||||
}: let
|
||||
host-matches =
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ in {
|
|||
# NOTE: home-manager *requires* modules to specify named arguments or it will not
|
||||
# pass values in. For this reason we must specify things like `pkgs` as a named attribute.
|
||||
${metadata.name} = args @ {pkgs, ...}: let
|
||||
system = args.system or args.pkgs.system;
|
||||
system = args.system or args.pkgs.stdenv.hostPlatform.system;
|
||||
target = args.target or system;
|
||||
|
||||
format = let
|
||||
|
|
|
|||
|
|
@ -68,6 +68,6 @@ in {
|
|||
aliased-packages = mapAttrs (name: value: packages-without-aliases.${value}) alias;
|
||||
packages = packages-without-aliases // aliased-packages // overrides;
|
||||
in
|
||||
filterPackages pkgs.system packages;
|
||||
filterPackages pkgs.stdenv.hostPlatform.system packages;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,6 @@ in {
|
|||
aliased-shells = mapAttrs (name: value: shells-without-aliases.${value}) alias;
|
||||
shells = shells-without-aliases // aliased-shells // overrides;
|
||||
in
|
||||
filterPackages pkgs.system shells;
|
||||
filterPackages pkgs.stdenv.hostPlatform.system shells;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue