else/clan-munix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix: replace pkgs.system with pkgs.stdenv.hostPlatform.system

Browse source 
evaluation warning: ‘system’ has been renamed to/replaced by ‘stdenv.hostPlatform.system’
This commit is contained in:
Val Packett 2025-12-04 07:24:51 -03:00
parent 7aa9f614da
commit 6e8e4b9fda
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nixosModules/default.nix
View file

@ -30,6 +30,7 @@
}; };
userbornConfigJson = pkgs.writeText "userborn.json" (builtins.toJSON userbornConfig); userbornConfigJson = pkgs.writeText "userborn.json" (builtins.toJSON userbornConfig);
userbornResults = pkgs.runCommand "baked userborn" {} "mkdir -p $out; ${lib.getExe pkgs.userborn} ${userbornConfigJson} $out"; userbornResults = pkgs.runCommand "baked userborn" {} "mkdir -p $out; ${lib.getExe pkgs.userborn} ${userbornConfigJson} $out";
system = pkgs.stdenv.hostPlatform.system;
in { in {
boot.isContainer = true; boot.isContainer = true;
fileSystems."/".device = lib.mkDefault "/dev/sda"; # dummy fileSystems."/".device = lib.mkDefault "/dev/sda"; # dummy
@ -222,7 +223,7 @@ in {
requires = ["wayland-proxy-virtwl.socket"]; requires = ["wayland-proxy-virtwl.socket"];
serviceConfig = { serviceConfig = {
ExecStartPre = "+/run/current-system/sw/bin/chmod 0666 /dev/dri/card0 /dev/dri/renderD128"; ExecStartPre = "+/run/current-system/sw/bin/chmod 0666 /dev/dri/card0 /dev/dri/renderD128";
ExecStart = "${virtwl.packages.${pkgs.system}.proxy}/bin/wayland-proxy-virtwl --virtio-gpu"; ExecStart = "${virtwl.packages.${system}.proxy}/bin/wayland-proxy-virtwl --virtio-gpu";
Environment = ["XDG_RUNTIME_DIR=${runtimeDir}"]; Environment = ["XDG_RUNTIME_DIR=${runtimeDir}"];
User = "appvm"; User = "appvm";
Group = "appvm"; Group = "appvm";
@ -246,12 +247,12 @@ in {
requires = ["sidebus-agent.socket"]; requires = ["sidebus-agent.socket"];
serviceConfig = { serviceConfig = {
ImportCredential = "sidebus.port"; ImportCredential = "sidebus.port";
ExecStart = "${sidebus.packages.${pkgs.system}.sidebus-agent}/bin/sidebus-agent"; ExecStart = "${sidebus.packages.${system}.sidebus-agent}/bin/sidebus-agent";
User = "appvm"; User = "appvm";
Group = "appvm"; Group = "appvm";
}; };
}; };
hardware.graphics.enable = true; hardware.graphics.enable = true;
hardware.graphics.package = self.packages.${pkgs.system}.mesa; hardware.graphics.package = self.packages.${system}.mesa;
} }

2
nixosModules/testvm.nix
View file

@ -6,7 +6,7 @@
environment.systemPackages = [ environment.systemPackages = [
pkgs.fastfetch pkgs.fastfetch
pkgs.htop pkgs.htop
virtwl.packages.${pkgs.system}.proxy virtwl.packages.${pkgs.stdenv.hostPlatform.system}.proxy
pkgs.wayland-utils pkgs.wayland-utils
pkgs.weston pkgs.weston
pkgs.waycheck pkgs.waycheck