mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
Merge pull request #269889 from felschr/tor-mullvad-libgl-fix
{tor,mullvad}-browser: add missing libGL required for wayland
This commit is contained in:
commit
fd44c780f0
@ -35,6 +35,7 @@
|
||||
, waylandSupport ? stdenv.isLinux
|
||||
, libxkbcommon
|
||||
, libdrm
|
||||
, libGL
|
||||
|
||||
, mediaSupport ? true
|
||||
, ffmpeg
|
||||
@ -82,7 +83,7 @@ let
|
||||
stdenv.cc.libc
|
||||
zlib
|
||||
] ++ lib.optionals libnotifySupport [ libnotify ]
|
||||
++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
|
||||
++ lib.optionals waylandSupport [ libxkbcommon libdrm libGL ]
|
||||
++ lib.optionals pipewireSupport [ pipewire ]
|
||||
++ lib.optionals pulseaudioSupport [ libpulseaudio ]
|
||||
++ lib.optionals libvaSupport [ libva ]
|
||||
|
@ -31,6 +31,7 @@
|
||||
, waylandSupport ? stdenv.isLinux
|
||||
, libxkbcommon
|
||||
, libdrm
|
||||
, libGL
|
||||
|
||||
, audioSupport ? mediaSupport
|
||||
|
||||
@ -98,7 +99,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
stdenv.cc.libc
|
||||
zlib
|
||||
] ++ lib.optionals libnotifySupport [ libnotify ]
|
||||
++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
|
||||
++ lib.optionals waylandSupport [ libxkbcommon libdrm libGL ]
|
||||
++ lib.optionals pipewireSupport [ pipewire ]
|
||||
++ lib.optionals pulseaudioSupport [ libpulseaudio ]
|
||||
++ lib.optionals libvaSupport [ libva ]
|
||||
|
Loading…
Reference in New Issue
Block a user