summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko <misiitone@gmail.com>2023-11-22 01:37:25 +0200
committerGitHub <noreply@github.com>2023-11-22 00:37:25 +0100
commit72edcc748a92377d0568c9536ece114dbabb948c (patch)
tree2893af47fdcd5beb0fdbc5a0aae53a2a0a1f98f8
parent46060f708325c5b500dd976958d447febff70b08 (diff)
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.
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix4
1 files changed, 2 insertions, 2 deletions
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)