diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-04-03 04:26:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-03 04:26:44 +0200 |
| commit | 26181202f92d6b7368cef71bc51870838e8c1262 (patch) | |
| tree | 6be05375e47ec2757551753a5cbac60c2e3f0647 | |
| parent | 0d7c02365bae3129606a3357cbe9084332ba66ad (diff) | |
| parent | 9131779490b81e6c81af178a7c367357b05a6dcb (diff) | |
| download | nixpkgs-26181202f92d6b7368cef71bc51870838e8c1262.tar nixpkgs-26181202f92d6b7368cef71bc51870838e8c1262.tar.gz nixpkgs-26181202f92d6b7368cef71bc51870838e8c1262.tar.bz2 nixpkgs-26181202f92d6b7368cef71bc51870838e8c1262.tar.lz nixpkgs-26181202f92d6b7368cef71bc51870838e8c1262.tar.xz nixpkgs-26181202f92d6b7368cef71bc51870838e8c1262.tar.zst nixpkgs-26181202f92d6b7368cef71bc51870838e8c1262.zip | |
Merge pull request #118372 from buckley310/vmwareview
vmware-horizon-client: use pkgs.cairo instead of bundled version
| -rw-r--r-- | pkgs/applications/networking/remote/vmware-horizon-client/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index f52373f2624..48ea229c244 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -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 |