Skip to content

Commit 7e4efe6

Browse files
committed
fix: pkgs.system is now pkgs.stdenv.hostPlatform.system
Caused by NixOS/nixpkgs#456527 Fixes #137 and #119
1 parent 633af19 commit 7e4efe6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,13 +683,13 @@ let
683683
# add nixos system closures to checks
684684
(withPrefix "nixos-" (
685685
lib.mapAttrs (_: x: x.config.system.build.toplevel) (
686-
lib.filterAttrs (_: x: x.pkgs.system == system) (inputs.self.nixosConfigurations or { })
686+
lib.filterAttrs (_: x: x.pkgs.stdenv.hostPlatform.system == system) (inputs.self.nixosConfigurations or { })
687687
)
688688
))
689689
# add darwin system closures to checks
690690
(withPrefix "darwin-" (
691691
lib.mapAttrs (_: x: x.system) (
692-
lib.filterAttrs (_: x: x.pkgs.system == system) (inputs.self.darwinConfigurations or { })
692+
lib.filterAttrs (_: x: x.pkgs.stdenv.hostPlatform.system == system) (inputs.self.darwinConfigurations or { })
693693
)
694694
))
695695
# add system-manager closures to checks

templates/toml-devenvs/checks/bye-devshell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ pkgs, inputs, ... }:
22
let
33
# defined in devshells/bye.nix
4-
shell = inputs.self.devShells.${pkgs.system}.bye;
4+
shell = inputs.self.devShells.${pkgs.stdenv.hostPlatform.system}.bye;
55
in
66
pkgs.stdenvNoCC.mkDerivation {
77
name = "hello-devshell";

templates/toml-devenvs/checks/default-devshell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ pkgs, inputs, ... }:
22
let
33
# defined in devshell.toml at root of this flake.
4-
shell = inputs.self.devShells.${pkgs.system}.default;
4+
shell = inputs.self.devShells.${pkgs.stdenv.hostPlatform.system}.default;
55
in
66
pkgs.stdenvNoCC.mkDerivation {
77
name = "default-devshell";

0 commit comments

Comments
 (0)