public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefox: wrapper: include libglvnd by default (WR)

This commit is contained in:
Cole Mickens 2020-07-06 23:21:23 -07:00
parent 8734a5e362
commit 68c68ff3c3
No known key found for this signature in database
GPG Key ID: B475C2955744A019
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -27,6 +27,7 @@ let
, icon ? browserName , icon ? browserName
, extraNativeMessagingHosts ? [] , extraNativeMessagingHosts ? []
, forceWayland ? false , forceWayland ? false
, useGlvnd ? true
, cfg ? config.${browserName} or {} , cfg ? config.${browserName} or {}
}: }:
@ -68,7 +69,7 @@ let
libs = lib.optionals stdenv.isLinux [ udev libva ] libs = lib.optionals stdenv.isLinux [ udev libva ]
++ lib.optional ffmpegSupport ffmpeg ++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport kerberos ++ lib.optional gssSupport kerberos
++ lib.optional gdkWayland libglvnd ++ lib.optional useGlvnd libglvnd
++ lib.optionals (cfg.enableQuakeLive or false) ++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash