firefox{,-bin}: add 'mesa', for wayland/drm

This commit is contained in:
Cole Mickens 2020-07-09 19:56:06 -07:00
parent c755302d7d
commit 8437596beb
No known key found for this signature in database
GPG key ID: B475C2955744A019
2 changed files with 4 additions and 1 deletions

View file

@ -47,6 +47,7 @@
, gnupg , gnupg
, ffmpeg_3 , ffmpeg_3
, runtimeShell , runtimeShell
, mesa # firefox wants gbm for drm+dmabuf
, systemLocale ? config.i18n.defaultLocale or "en-US" , systemLocale ? config.i18n.defaultLocale or "en-US"
}: }:
@ -106,6 +107,7 @@ stdenv.mkDerivation {
gtk2 gtk2
gtk3 gtk3
kerberos kerberos
mesa
libX11 libX11
libXScrnSaver libXScrnSaver
libXcomposite libXcomposite

View file

@ -10,6 +10,7 @@
, udev , udev
, kerberos , kerberos
, libva , libva
, mesa # firefox wants gbm for drm+dmabuf
}: }:
## configurability of the wrapper itself ## configurability of the wrapper itself
@ -65,7 +66,7 @@ let
++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
++ extraNativeMessagingHosts ++ extraNativeMessagingHosts
); );
libs = lib.optionals stdenv.isLinux [ udev libva ] libs = lib.optionals stdenv.isLinux [ udev libva mesa ]
++ lib.optional ffmpegSupport ffmpeg ++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport kerberos ++ lib.optional gssSupport kerberos
++ lib.optional gdkWayland libglvnd ++ lib.optional gdkWayland libglvnd