diff options
| author | Cole Mickens <cole.mickens@gmail.com> | 2020-07-06 23:21:23 -0700 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:52:13 +0000 |
| commit | 614eb69e0c42a94725c471586b0ed6889331babc (patch) | |
| tree | e472e18b170261ad665412240c8e8a8930fb5d69 /nixpkgs | |
| parent | 67904964490521c76df8a8e08fd63e3fc43a6251 (diff) | |
| download | nixlib-614eb69e0c42a94725c471586b0ed6889331babc.tar nixlib-614eb69e0c42a94725c471586b0ed6889331babc.tar.gz nixlib-614eb69e0c42a94725c471586b0ed6889331babc.tar.bz2 nixlib-614eb69e0c42a94725c471586b0ed6889331babc.tar.lz nixlib-614eb69e0c42a94725c471586b0ed6889331babc.tar.xz nixlib-614eb69e0c42a94725c471586b0ed6889331babc.tar.zst nixlib-614eb69e0c42a94725c471586b0ed6889331babc.zip | |
firefox: wrapper: include libglvnd by default (WR)
(cherry picked from commit 68c68ff3c38760dbfa34c27fdcf5e59825d98f44)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 283ff79314d9..9a8308fa9a94 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -28,6 +28,7 @@ let , icon ? browserName , extraNativeMessagingHosts ? [] , forceWayland ? false + , useGlvnd ? true , cfg ? config.${browserName} or {} }: @@ -69,7 +70,7 @@ let libs = lib.optionals stdenv.isLinux [ udev libva mesa ] ++ 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 |