VR: Difference between revisions - Official NixOS Wiki

(3 intermediate revisions by 3 users not shown)

Line 139:

enable = true;

openFirewall = true;

~~# Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications~~

~~# will automatically read this and work with WiVRn (Note: This does not currently~~

~~# apply for games run in Valve's Proton)~~

~~defaultRuntime = true;~~

# Run WiVRn as a systemd service on startup

Line 152:

Line 147:

# You should use the default configuration (which is no configuration), as that works the best out of the box.

# However, if you need to configure something see https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md for configuration ~~opteins andhttps~~://mynixos.com/nixpkgs/option/services.wivrn.config.json for an example configuration.

# However, if you need to configure something see https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md for configuration options and https://mynixos.com/nixpkgs/option/services.wivrn.config.json for an example configuration.

};|name=configuration.nix|lang=nix}}

Line 243:

Line 238:

}}

{{file|/etc/nixos/bwrap.patch|diff|3=diff --git a/bubblewrap.c b/bubblewrap.c

index ~~8322ea0~~..~~4e20262~~ 100644

index e05f697..504512a 100644

--- a/bubblewrap.c

+++ b/bubblewrap.c

@@ -~~868~~,13 +~~868~~,6 @@ acquire_privs (void)

@@ -791,13 +791,6 @@ acquire_privs (void)

/* ~~Keep~~ only ~~the required capabilities for setup~~ */

/* Historically we supported this, but now we only do user namespaces */

~~set_required_caps~~ ();

die ("setuid use of bubblewrap is not supported");

}

- else if (real_uid != 0 && has_caps ())

Line 260:

Line 255:

{

/* If our uid is 0, default to inheriting all caps; the caller

}}

|name=|lang=}}

@@ Line 139: / Line 139: @@
    enable = true;
    openFirewall = true;
-  # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications
-  # will automatically read this and work with WiVRn (Note: This does not currently
-  # apply for games run in Valve's Proton)
-    defaultRuntime = true;
    # Run WiVRn as a systemd service on startup
@@ Line 152: / Line 147: @@
    # You should use the default configuration (which is no configuration), as that works the best out of the box.
-   # However, if you need to configure something see https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md for configuration opteins andhttps://mynixos.com/nixpkgs/option/services.wivrn.config.json for an example configuration.
+   # However, if you need to configure something see https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md for configuration options and https://mynixos.com/nixpkgs/option/services.wivrn.config.json for an example configuration.
 };|name=configuration.nix|lang=nix}}
@@ Line 243: / Line 238: @@
 }}
 {{file|/etc/nixos/bwrap.patch|diff|3=diff --git a/bubblewrap.c b/bubblewrap.c
-index 8322ea0..4e20262 100644
+index e05f697..504512a 100644
 --- a/bubblewrap.c
 +++ b/bubblewrap.c
-@@ -868,13 +868,6 @@ acquire_privs (void)
+@@ -791,13 +791,6 @@ acquire_privs (void)
-        /* Keep only the required capabilities for setup */
+        /* Historically we supported this, but now we only do user namespaces */
-        set_required_caps ();
+        die ("setuid use of bubblewrap is not supported");
       }
 -  else if (real_uid != 0 && has_caps ())
@@ Line 260: / Line 255: @@
       {
         /* If our uid is 0, default to inheriting all caps; the caller
-}}
+|name=|lang=}}
 <translate>