BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #208361 from aacebedo/aacebedo/vivaldi_wayland

Browse source
This commit is contained in:
Sandro 2022-12-30 22:03:34 +01:00 committed by GitHub
commit cccb11da53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/networking/browsers/vivaldi/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence { lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr , 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 , freetype, fontconfig, libXft, libXrender, libxcb, expat
, libuuid , libuuid
, libxml2 , libxml2
@ -8,6 +8,7 @@
, libdrm, mesa , libdrm, mesa
, nss, nspr , nss, nspr
, patchelf, makeWrapper , patchelf, makeWrapper
, wayland, pipewire
, isSnapshot ? false , isSnapshot ? false
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
, enableWidevine ? false, vivaldi-widevine ? 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 stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr 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 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 libxml2 pango cairo
libdrm mesa libdrm mesa
wayland pipewire
] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
++ lib.optional pulseSupport libpulseaudio; ++ lib.optional pulseSupport libpulseaudio;
@ -89,6 +91,7 @@ in stdenv.mkDerivation rec {
done done
wrapProgram "$out/bin/vivaldi" \ wrapProgram "$out/bin/vivaldi" \
--add-flags ${lib.escapeShellArg commandLineArgs} \ --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}/ \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
'' + lib.optionalString enableWidevine '' '' + lib.optionalString enableWidevine ''