nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-20 23:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #270140 from NixOS/backport-269889-to-release-23.11

Browse Source 
[Backport release-23.11] {tor,mullvad}-browser: add missing libGL required for wayland
This commit is contained in:
Pierre Bourdon
2023-11-26 15:07:25 +01:00
committed by GitHub
parent eacda838b1 bf37122237
commit f8174fb2c8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/mullvad-browser/default.nix
View File

@@ -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 ]

3
pkgs/applications/networking/browsers/tor-browser/default.nix
View File

@@ -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 ]