diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2020-05-05 20:21:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-05 20:21:43 +0200 |
commit | d9f4f0645ccbf537d56fdb357f1664372fe493c7 (patch) | |
tree | eb45ba8f0dd899dded546d824f9dd49d739ca121 | |
parent | e50628419327611ddfcd489772b3afcf217a2d58 (diff) | |
parent | 552d72957193ebd6051e9bf5ddeaa0c1ed59f96e (diff) | |
download | nixlib-d9f4f0645ccbf537d56fdb357f1664372fe493c7.tar nixlib-d9f4f0645ccbf537d56fdb357f1664372fe493c7.tar.gz nixlib-d9f4f0645ccbf537d56fdb357f1664372fe493c7.tar.bz2 nixlib-d9f4f0645ccbf537d56fdb357f1664372fe493c7.tar.lz nixlib-d9f4f0645ccbf537d56fdb357f1664372fe493c7.tar.xz nixlib-d9f4f0645ccbf537d56fdb357f1664372fe493c7.tar.zst nixlib-d9f4f0645ccbf537d56fdb357f1664372fe493c7.zip |
Merge pull request #81917 from colemickens/nixpkgs-firefox-libva
firefox: wrapper: add libva to libs
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 0afa8ca7b834..52773bf291a6 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,13 +2,14 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd +, ffmpeg_4, xorg, libpulseaudio, libcanberra-gtk2, libglvnd , gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native , fx_cast_bridge , udev , kerberos +, libva }: ## configurability of the wrapper itself @@ -64,8 +65,8 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optional stdenv.isLinux udev - ++ lib.optional ffmpegSupport ffmpeg + libs = lib.optionals stdenv.isLinux [ udev libva ] + ++ lib.optional ffmpegSupport ffmpeg_4 ++ lib.optional gssSupport kerberos ++ lib.optional gdkWayland libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) |