From 72edcc748a92377d0568c9536ece114dbabb948c Mon Sep 17 00:00:00 2001 From: Mikko Date: Wed, 22 Nov 2023 01:37:25 +0200 Subject: wrapFirefox: unpin ffmpeg version (#269038) The pin was added when ffmpeg pointed to ffmpeg_4, which did not support AV1 VAAPI decoding. Now ffmpeg points to ffmpeg_6. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/networking/browsers/firefox') diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 25c7ac5bb659..745b21eeb807 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -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) -- cgit 1.4.1