Merge pull request #92823 from colemickens/firefox-drm

firefox{,-bin}: add 'mesa', for wayland/drm
2020-07-11 13:48:22 +02:00
parent 98b2a62eda 8437596beb
commit 2bb6bc6648
2 changed files with 4 additions and 1 deletions
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -47,6 +47,7 @@
 , gnupg
 , ffmpeg_3
 , runtimeShell
+, mesa # firefox wants gbm for drm+dmabuf
 , systemLocale ? config.i18n.defaultLocale or "en-US"
 }:

@@ -106,6 +107,7 @@ stdenv.mkDerivation {
      gtk2
      gtk3
      kerberos
+      mesa
      libX11
      libXScrnSaver
      libXcomposite
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -10,6 +10,7 @@
 , udev
 , kerberos
 , libva
+, mesa # firefox wants gbm for drm+dmabuf
 }:

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