diff options
| author | Alexandre Acebedo <alexandre@acebedo.fr> | 2022-12-21 10:55:16 +0100 |
|---|---|---|
| committer | Alexandre Acebedo <alexandre@acebedo.fr> | 2022-12-30 14:19:19 +0100 |
| commit | e40216fa1b52ca3034c803de8279a66bb9311361 (patch) | |
| tree | dcc393b338177290ca6c536c6d824b245aa7821e /pkgs/applications/networking/browsers/vivaldi | |
| parent | d4513957f671620cbc768cd2b823139f105921e3 (diff) | |
vivaldi: add wayland support and remove missing libGLES.so error
Diffstat (limited to 'pkgs/applications/networking/browsers/vivaldi')
| -rw-r--r-- | pkgs/applications/networking/browsers/vivaldi/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index df0a3323d72a4..9f3baccc42474 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsa-lib, dbus, cups, libexif, ffmpeg, systemd, libva +, alsa-lib, dbus, cups, libexif, ffmpeg, systemd, libva, libGL , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , libxml2 @@ -8,6 +8,7 @@ , libdrm, mesa , nss, nspr , patchelf, makeWrapper +, wayland, pipewire , isSnapshot ? false , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , enableWidevine ? false, vivaldi-widevine ? null @@ -38,9 +39,10 @@ in stdenv.mkDerivation rec { stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd libva - freetype fontconfig libXrender libuuid expat glib nss nspr + freetype fontconfig libXrender libuuid expat glib nss nspr libGL libxml2 pango cairo libdrm mesa + wayland pipewire ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs ++ lib.optional pulseSupport libpulseaudio; @@ -89,6 +91,7 @@ in stdenv.mkDerivation rec { done wrapProgram "$out/bin/vivaldi" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} '' + lib.optionalString enableWidevine '' |