fix(nix): rename pkgs.system -> pkgs.stdenv.hostPlatform.system

water-sucks · water-sucks · commit b78e455b99a0 · 2025-11-09T04:04:21.000-08:00
diff --git a/default.nix b/default.nix
@@ -1,7 +1,8 @@
 {pkgs ? import <nixpkgs> {}}: let
   flakeSelf = import ./flake-compat.nix;
+  inherit (pkgs.stdenv.hostPlatform) system;
 in {
-  inherit (flakeSelf.packages.${pkgs.system}) nixos nixosLegacy;
+  inherit (flakeSelf.packages.${system}) nixos nixosLegacy;
 
   # Do not use lib.importApply here for better error tracking, since
   # it causes an infinite recursion for a currently unknown reason.
diff --git a/flake.nix b/flake.nix
@@ -25,12 +25,12 @@
       pkgs = pkgsFor system;
       inherit (pkgs) callPackage;
     in {
-      default = self.packages.${pkgs.system}.nixos;
+      default = self.packages.${system}.nixos;
 
       nixos = callPackage ./package.nix {
         revision = self.rev or self.dirtyRev or "unknown";
       };
-      nixosLegacy = self.packages.${pkgs.system}.nixos.override {flake = false;};
+      nixosLegacy = self.packages.${system}.nixos.override {flake = false;};
     });
 
     devShells = eachSystem (system: let
diff --git a/module.nix b/module.nix
@@ -11,6 +11,8 @@
   cfg = config.services.nixos-cli;
   nixosCfg = config.system.nixos;
 
+  inherit (pkgs.stdenv.hostPlatform) system;
+
   inherit (lib) types;
 
   tomlFormat = pkgs.formats.toml {};
@@ -22,8 +24,8 @@ in {
       type = types.package;
       default =
         if useFlakePkg
-        then self.packages.${pkgs.system}.nixos
-        else self.packages.${pkgs.system}.nixosLegacy;
+        then self.packages.${system}.nixos
+        else self.packages.${system}.nixosLegacy;
       description = "Package to use for nixos-cli";
     };
 
