Unverified Commit cccb11da authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #208361 from aacebedo/aacebedo/vivaldi_wayland

parents f4916e1b e40216fa

pkgs/applications/networking/browsers/vivaldi/default.nix

+5 −2
Original line number Diff line number Diff line 
{ 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 ''