From 662a0e1bdbd529823f0c19cc1c8b4c346406d16d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 30 Jun 2024 00:28:54 +0200 Subject: [PATCH] wrappers: use system from stdenv.hostPlatform `pgs.system` is a flaky alias and it is more reliable to directly use `pkgs.stdenv.hostPlatform.system` --- README.md | 2 +- wrappers/darwin.nix | 2 +- wrappers/hm.nix | 2 +- wrappers/nixos.nix | 2 +- wrappers/standalone.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1396a543..c3f45e3a 100644 --- a/README.md +++ b/README.md @@ -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; }) ]; diff --git a/wrappers/darwin.nix b/wrappers/darwin.nix index 62fde07a..2891c0f1 100644 --- a/wrappers/darwin.nix +++ b/wrappers/darwin.nix @@ -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; } ]); diff --git a/wrappers/hm.nix b/wrappers/hm.nix index cc443d8a..fbcf7e55 100644 --- a/wrappers/hm.nix +++ b/wrappers/hm.nix @@ -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; }) { diff --git a/wrappers/nixos.nix b/wrappers/nixos.nix index caa11518..bc35c685 100644 --- a/wrappers/nixos.nix +++ b/wrappers/nixos.nix @@ -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; diff --git a/wrappers/standalone.nix b/wrappers/standalone.nix index 075c7a5e..2e8ae16c 100644 --- a/wrappers/standalone.nix +++ b/wrappers/standalone.nix @@ -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"; }) // {