public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from NixOS/backport-133398-to-release-21.05

Browse Source 
[Backport release-21.05] zoom-us: Do not apply screen scaling twice
This commit is contained in:
Artturi 2021-08-12 21:48:26 +03:00 committed by GitHub
commit c20adcfd62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions

5
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@ -100,12 +100,13 @@ in stdenv.mkDerivation rec {
rm $out/bin/zoom rm $out/bin/zoom
# Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect # 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: # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm:
# Also clear Qt environment variables to prevent # Clear Qt paths to prevent tripping over "foreign" Qt resources.
# zoom from tripping over "foreign" Qt ressources. # Clear Qt screen scaling settings to prevent over-scaling.
makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \ makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \
--run "cd $out/opt/zoom" \ --run "cd $out/opt/zoom" \
--unset QML2_IMPORT_PATH \ --unset QML2_IMPORT_PATH \
--unset QT_PLUGIN_PATH \ --unset QT_PLUGIN_PATH \
--unset QT_SCREEN_SCALE_FACTORS \
--prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \ --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \
--prefix LD_LIBRARY_PATH ":" ${libs} --prefix LD_LIBRARY_PATH ":" ${libs}