diff options
| author | Artturin <Artturin@artturin.com> | 2023-01-09 05:36:01 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-01-09 21:13:22 +0200 |
| commit | 2eeb34c2737f5eb8a2796701584a7b0551cb053a (patch) | |
| tree | bbd2d01a65ae344e46a8c91537f6a0f00257d410 /nixos | |
| parent | ecab3edeb79a5257974d24acd04e5c9b3c245e6c (diff) | |
| download | nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar.gz nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar.bz2 nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar.lz nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar.xz nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar.zst nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.zip | |
treewide: {build,host,target}Platform -> stdenv.{build,host,target}Platform
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/programs/steam.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 6 | ||||
| -rw-r--r-- | nixos/tests/libvirtd.nix | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 1b69aac9886..98269f6250d 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -12,14 +12,14 @@ in { type = types.package; default = pkgs.steam.override { extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.hostPlatform.is64bit + if pkgs.stdenv.hostPlatform.is64bit then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; }; defaultText = literalExpression '' pkgs.steam.override { extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.hostPlatform.is64bit + if pkgs.stdenv.hostPlatform.is64bit then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; } diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 1d115108c30..f37d197f162 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -819,10 +819,10 @@ in system-features = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.hostPlatform ? gcc.arch) ( + optionals (pkgs.stdenv.hostPlatform ? gcc.arch) ( # a builder can run code for `gcc.arch` and inferior architectures - [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++ - map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} or []) + [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or []) ) ); } diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix index 49258fcb93e..b6e60407599 100644 --- a/nixos/tests/libvirtd.nix +++ b/nixos/tests/libvirtd.nix @@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; testScript = let - nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.hostPlatform.system}; + nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.stdenv.hostPlatform.system}; virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy"; in '' start_all() |