Merge branch 'nvidia' into 'master'

nongnu: nvidia-module: Fix nvidia_drm.modeset=0 comment. See merge request nonguix/nonguix!696
nongnu: firefox-esr: Use ffmpeg-6.
2025-10-01 18:05:00 +00:00 · 2025-09-30 17:33:07 +00:00 · 2025-09-30 11:12:52 -04:00 · 2025-06-15 22:25:48 +02:00
2 changed files with 3 additions and 3 deletions
--- a/nongnu/packages/mozilla.scm
+++ b/nongnu/packages/mozilla.scm
@ -457,7 +457,7 @@
        cups
        dbus-glib
        freetype
-        ffmpeg
+        ffmpeg-6
        gdk-pixbuf
        glib
        gtk+
--- a/nongnu/packages/nvidia.scm
+++ b/nongnu/packages/nvidia.scm
@ -562,7 +562,7 @@ modules, also add @code{modprobe.blacklist=nouveau} to @code{kernel-arguments}
 field of the @code{operating-system} configuration.

 If the NVIDIA card is not used for displaying, or on a Wayland environment,
-add @code{nvidia_drm.modeset=1} to @code{kernel-arguments} as well.")
+add @code{nvidia_drm.modeset=0} to @code{kernel-arguments} as well.")
    (license
     (license:nonfree
      (format #f "file:///share/doc/nvidia-driver-~a/LICENSE" version)))))
@ -600,7 +600,7 @@ actually use these modules, also add @code{modprobe.blacklist=nouveau} to
@code{kernel-arguments} field of the @code{operating-system} configuration.

 If the NVIDIA card is not used for displaying, or on a Wayland environment,
-add @code{nvidia_drm.modeset=1} to @code{kernel-arguments} as well.")
+add @code{nvidia_drm.modeset=0} to @code{kernel-arguments} as well.")
      (license license-gnu:gpl2))))

 (define-public nvidia-module-open-beta