aboutsummaryrefslogtreecommitdiff
path: root/pkgs/applications/networking/browsers/firefox
diff options
context:
space:
mode:
authorCole Mickens <cole.mickens@gmail.com>2020-07-06 23:21:23 -0700
committerCole Mickens <cole.mickens@gmail.com>2020-07-07 03:33:49 -0700
commit68c68ff3c38760dbfa34c27fdcf5e59825d98f44 (patch)
tree13bd3557fd519d272a5f00a9461c967436672c3d /pkgs/applications/networking/browsers/firefox
parent8734a5e362aad7668e528de0d1defa5b6bcd1529 (diff)
firefox: wrapper: include libglvnd by default (WR)
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 6e6c1f75b75d..518bac3106e4 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -27,6 +27,7 @@ let
, icon ? browserName
, extraNativeMessagingHosts ? []
, forceWayland ? false
+ , useGlvnd ? true
, cfg ? config.${browserName} or {}
}:
@@ -68,7 +69,7 @@ let
libs = lib.optionals stdenv.isLinux [ udev libva ]
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport kerberos
- ++ lib.optional gdkWayland libglvnd
+ ++ lib.optional useGlvnd libglvnd
++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash