nix: switch to wl-cross-domain-proxy
This commit is contained in:
parent
13b2afcc14
commit
9911b15fb7
1 changed files with 5 additions and 6 deletions
|
|
@ -1,6 +1,5 @@
|
||||||
{
|
{
|
||||||
self,
|
self,
|
||||||
virtwl,
|
|
||||||
sidebus,
|
sidebus,
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
|
@ -223,11 +222,11 @@ in
|
||||||
serviceConfig.ExecStart = "/opt/bin/muvm-pwbridge";
|
serviceConfig.ExecStart = "/opt/bin/muvm-pwbridge";
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.sockets.wayland-proxy-virtwl = {
|
systemd.sockets.wayland-proxy = {
|
||||||
enable = true;
|
enable = true;
|
||||||
description = "Wayland cross-domain proxy socket";
|
description = "Wayland cross-domain proxy socket";
|
||||||
wantedBy = [ "microvm.target" ];
|
wantedBy = [ "microvm.target" ];
|
||||||
partOf = [ "wayland-proxy-virtwl.service" ];
|
partOf = [ "wayland-proxy.service" ];
|
||||||
listenStreams = [ "${runtimeDir}/wayland-1" ];
|
listenStreams = [ "${runtimeDir}/wayland-1" ];
|
||||||
socketConfig = {
|
socketConfig = {
|
||||||
SocketUser = "appvm";
|
SocketUser = "appvm";
|
||||||
|
|
@ -235,13 +234,13 @@ in
|
||||||
FileDescriptorName = "wayland";
|
FileDescriptorName = "wayland";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd.services.wayland-proxy-virtwl = {
|
systemd.services.wayland-proxy = {
|
||||||
enable = true;
|
enable = true;
|
||||||
description = "Wayland cross-domain proxy";
|
description = "Wayland cross-domain proxy";
|
||||||
requires = [ "wayland-proxy-virtwl.socket" ];
|
requires = [ "wayland-proxy.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.${system}.proxy}/bin/wayland-proxy-virtwl --virtio-gpu";
|
ExecStart = "${self.packages.${system}.wl-cross-domain-proxy}/bin/wl-cross-domain-proxy --listen-fd --filter-global wp_presentation";
|
||||||
User = "appvm";
|
User = "appvm";
|
||||||
Group = "appvm";
|
Group = "appvm";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue