Skip to content

Commit

Permalink
wrappers: use system from stdenv.hostPlatform
Browse files Browse the repository at this point in the history
`pgs.system` is a flaky alias and it is more reliable to directly use
`pkgs.stdenv.hostPlatform.system`
  • Loading branch information
SuperSandro2000 authored and GaetanLepage committed Jun 30, 2024
1 parent c062b97 commit 662a0e1
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ If you want to use it standalone, you can use the `makeNixvim` function:
```nix
{ pkgs, nixvim, ... }: {
environment.systemModules = [
(nixvim.legacyPackages."${pkgs.system}".makeNixvim {
(nixvim.legacyPackages."${pkgs.stdenv.hostPlatform.system}".makeNixvim {
colorschemes.gruvbox.enable = true;
})
];
Expand Down
2 changes: 1 addition & 1 deletion wrappers/darwin.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ in
environment.systemPackages = [
cfg.finalPackage
cfg.printInitPackage
] ++ (lib.optional cfg.enableMan self.packages.${pkgs.system}.man-docs);
] ++ (lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs);
}
{ inherit (cfg) warnings assertions; }
]);
Expand Down
2 changes: 1 addition & 1 deletion wrappers/hm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ in
home.packages = [
cfg.finalPackage
cfg.printInitPackage
] ++ (lib.optional cfg.enableMan self.packages.${pkgs.system}.man-docs);
] ++ (lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs);
}
(mkIf (!cfg.wrapRc) { xdg.configFile = files; })
{
Expand Down
2 changes: 1 addition & 1 deletion wrappers/nixos.nix
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ in
environment.systemPackages = [
cfg.finalPackage
cfg.printInitPackage
] ++ (lib.optional cfg.enableMan self.packages.${pkgs.system}.man-docs);
] ++ (lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs);
}
(mkIf (!cfg.wrapRc) {
environment.etc = files;
Expand Down
2 changes: 1 addition & 1 deletion wrappers/standalone.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ let
paths = [
config.finalPackage
config.printInitPackage
] ++ pkgs.lib.optional config.enableMan self.packages.${pkgs.system}.man-docs;
] ++ pkgs.lib.optional config.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
meta.mainProgram = "nvim";
})
// {
Expand Down

0 comments on commit 662a0e1

Please sign in to comment.