Unverified Commit f8174fb2 authored Nov 26, 2023 by Pierre Bourdon Committed by GitHub Nov 26, 2023

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

[Backport release-23.11] {tor,mullvad}-browser: add missing libGL required for wayland

parents eacda838 bf371222

pkgs/applications/networking/browsers/mullvad-browser/default.nix

+2 −1

Original line number	Diff line number	Diff line
		@@ -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 ]

pkgs/applications/networking/browsers/tor-browser/default.nix

+2 −1

Original line number	Diff line number	Diff line
		@@ -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 ]