diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2023-11-26 15:07:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-26 15:07:25 +0100 |
| commit | f8174fb2c8037591b4ba32d05be5b92e86b2ff4e (patch) | |
| tree | 853713c904ad5f1d5364f980b5b268febeb9f139 /pkgs/applications | |
| parent | eacda838b1420e335a163c66d8ee80b837540729 (diff) | |
| parent | bf37122237faa4c3a4bd2a8db9f1ba83c9f0be1d (diff) | |
Merge pull request #270140 from NixOS/backport-269889-to-release-23.11
[Backport release-23.11] {tor,mullvad}-browser: add missing libGL required for waylandDiffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/mullvad-browser/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/tor-browser/default.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 532e48d1fab27..5794a04489daa 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -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 ] diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index b2ed9cca471a3..ce72abe79e7bf 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -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 ] |