Commit f1d448db authored by mjjs's avatar mjjs Committed by Martin Weinelt
Browse files

buildMozillaMach: unpin ffmpeg version 

The pin was added when ffmpeg pointed to ffmpeg_4, which did not support
AV1 VAAPI decoding. Now ffmpeg points to ffmpeg_6.

(cherry picked from commit 552c0f2b046f530564c0f9e7eb07b2a3d82aaa0a)
parent 32f11666

pkgs/applications/networking/browsers/firefox/wrapper.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, jq, xdg-utils, writeText



## various stuff that can be plugged in

, ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc

, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc

, gnome/*.gnome-shell*/

, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire

, tridactyl-native
@@ -87,7 +87,7 @@ let 


      libs =   lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ]

            ++ lib.optional pipewireSupport pipewire

            ++ lib.optional ffmpegSupport ffmpeg_5

            ++ lib.optional ffmpegSupport ffmpeg

            ++ lib.optional gssSupport libkrb5

            ++ lib.optional useGlvnd libglvnd

            ++ lib.optionals (cfg.enableQuakeLive or false)