diff options
| author | Artturi <Artturin@artturin.com> | 2021-08-12 21:48:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 21:48:26 +0300 |
| commit | c20adcfd62244ba353e2ac4a774321539d9c9986 (patch) | |
| tree | 3df9a65729c95577844ac7215c071b751ef42a0f | |
| parent | Merge pull request #133613 from NixOS/backport-133571-to-release-21.05 (diff) | |
| parent | zoom-us: Do not apply screen scaling twice (diff) | |
| download | nixpkgs-c20adcfd62244ba353e2ac4a774321539d9c9986.tar.gz | |
Merge pull request #133630 from NixOS/backport-133398-to-release-21.05
[Backport release-21.05] zoom-us: Do not apply screen scaling twice
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/zoom-us/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 9e7593c1fb88..70b40fc9ae1b 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -100,12 +100,13 @@ in stdenv.mkDerivation rec { rm $out/bin/zoom # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm: - # Also clear Qt environment variables to prevent - # zoom from tripping over "foreign" Qt ressources. + # Clear Qt paths to prevent tripping over "foreign" Qt resources. + # Clear Qt screen scaling settings to prevent over-scaling. makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \ --run "cd $out/opt/zoom" \ --unset QML2_IMPORT_PATH \ --unset QT_PLUGIN_PATH \ + --unset QT_SCREEN_SCALE_FACTORS \ --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \ --prefix LD_LIBRARY_PATH ":" ${libs} |
