Merge pull request #118372 from buckley310/vmwareview

vmware-horizon-client: use pkgs.cairo instead of bundled version
This commit is contained in:
Sandro 2021-04-03 04:26:44 +02:00 committed by GitHub
commit 26181202f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,6 +3,7 @@
, at-spi2-atk
, atk
, buildFHSUserEnv
, cairo
, dbus
, fetchurl
, fontconfig
@ -67,6 +68,9 @@ let
# This libjpeg library interferes with Chromium, so we will be using ours instead.
rm $out/lib/vmware/libjpeg.*
# This library causes the program to core-dump occasionally. Use ours instead.
rm $out/lib/vmware/view/crtbora/libcairo.*
# Force the default GTK theme (Adwaita) because Horizon is prone to
# UI usability issues when using non-default themes, such as Adwaita-dark.
makeWrapper "$out/bin/vmware-view" "$out/bin/vmware-view_wrapper" \
@ -84,6 +88,7 @@ let
targetPkgs = pkgs: [
at-spi2-atk
atk
cairo
dbus
fontconfig
freetype