Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 98b2a62eda83
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2bb6bc6648a8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 10, 2020

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

    @colemickens
    colemickens committed Jul 10, 2020
    Copy the full SHA
    8437596 View commit details

Commits on Jul 11, 2020

  1. Merge pull request #92823 from colemickens/firefox-drm 

    firefox{,-bin}: add 'mesa', for wayland/drm
    @flokli
    flokli authored Jul 11, 2020
    Copy the full SHA
    2bb6bc6 View commit details
Showing with 4 additions and 1 deletion.
  1. +2 −0 pkgs/applications/networking/browsers/firefox-bin/default.nix
  2. +2 −1 pkgs/applications/networking/browsers/firefox/wrapper.nix
2 changes: 2 additions & 0 deletions pkgs/applications/networking/browsers/firefox-bin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion pkgs/applications/networking/browsers/firefox/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -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