vmware-horizon-client: use pkgs.cairo instead of bundled version

This commit is contained in:
Sean Buckley 2021-04-02 19:46:12 -04:00
parent 64cf4e0c98
commit 9131779490

View File

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