pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #269889 from felschr/tor-mullvad-libgl-fix

{tor,mullvad}-browser: add missing libGL required for wayland

authored by Pierre Bourdon and committed by GitHub fd44c780 d50cfe20

+4 -2
unified split
+2 -1
pkgs/applications/networking/browsers/mullvad-browser/default.nix
··· 35 , waylandSupport ? stdenv.isLinux 36 , libxkbcommon 37 , libdrm 38 39 , mediaSupport ? true 40 , ffmpeg ··· 82 stdenv.cc.libc 83 zlib 84 ] ++ lib.optionals libnotifySupport [ libnotify ] 85 - ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] 86 ++ lib.optionals pipewireSupport [ pipewire ] 87 ++ lib.optionals pulseaudioSupport [ libpulseaudio ] 88 ++ lib.optionals libvaSupport [ libva ]
··· 35 , waylandSupport ? stdenv.isLinux 36 , libxkbcommon 37 , libdrm 38 + , libGL 39 40 , mediaSupport ? true 41 , ffmpeg ··· 83 stdenv.cc.libc 84 zlib 85 ] ++ lib.optionals libnotifySupport [ libnotify ] 86 + ++ lib.optionals waylandSupport [ libxkbcommon libdrm libGL ] 87 ++ lib.optionals pipewireSupport [ pipewire ] 88 ++ lib.optionals pulseaudioSupport [ libpulseaudio ] 89 ++ lib.optionals libvaSupport [ libva ]
+2 -1
pkgs/applications/networking/browsers/tor-browser/default.nix
··· 31 , waylandSupport ? stdenv.isLinux 32 , libxkbcommon 33 , libdrm 34 35 , audioSupport ? mediaSupport 36 ··· 98 stdenv.cc.libc 99 zlib 100 ] ++ lib.optionals libnotifySupport [ libnotify ] 101 - ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] 102 ++ lib.optionals pipewireSupport [ pipewire ] 103 ++ lib.optionals pulseaudioSupport [ libpulseaudio ] 104 ++ lib.optionals libvaSupport [ libva ]
··· 31 , waylandSupport ? stdenv.isLinux 32 , libxkbcommon 33 , libdrm 34 + , libGL 35 36 , audioSupport ? mediaSupport 37 ··· 99 stdenv.cc.libc 100 zlib 101 ] ++ lib.optionals libnotifySupport [ libnotify ] 102 + ++ lib.optionals waylandSupport [ libxkbcommon libdrm libGL ] 103 ++ lib.optionals pipewireSupport [ pipewire ] 104 ++ lib.optionals pulseaudioSupport [ libpulseaudio ] 105 ++ lib.optionals libvaSupport [ libva ]