From 37842ec1a4e67425f646366e07448a53bcedd434 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Thu, 23 Mar 2023 12:56:03 +0100 Subject: vivaldi: Fix X11 video / Vulkan hardware acceleration --- pkgs/applications/networking/browsers/vivaldi/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/networking/browsers/vivaldi') diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 49be24bc5ec0a..2a52b7a237a60 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -5,7 +5,9 @@ , libuuid , libxml2 , glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core +, qt5 , libdrm, mesa +, vulkan-loader , nss, nspr , patchelf, makeWrapper , wayland, pipewire @@ -43,13 +45,16 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ patchelf makeWrapper ]; + dontWrapQtApps = true; + buildInputs = [ 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 + qt5.qtbase freetype fontconfig libXrender libuuid expat glib nss nspr libGL libxml2 pango cairo - libdrm mesa + libdrm mesa vulkan-loader wayland pipewire ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs ++ lib.optional pulseSupport libpulseaudio; @@ -68,6 +73,10 @@ in stdenv.mkDerivation rec { --set-rpath "${libPath}" \ opt/${vivaldiName}/$f done + + for f in libGLESv2.so libqt5_shim.so ; do + patchelf --set-rpath "${libPath}" opt/${vivaldiName}/$f + done '' + lib.optionalString proprietaryCodecs '' ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*} '' + '' -- cgit 1.4.1