git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #116355 from Yarny0/zoom-qt
commitdc4f0a172114b345c0b020709a536fd0623a5946 authorJörg Thalheim <Mic92@users.noreply.github.com> dateMon 15 Mar 2021, 18:44 (6 years ago) parentbdc36a0e50d16f
2 files changed+6−3
pkgs/applications/networking/instant-messengers/zoom-us/default.nix+5−2 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/networking/instant-messengers/zoom-us/default.nix+5−2
@@ -23,7 +23,6 @@
2323, pciutils
2424, procps
2525, util-linux
26−, qttools
2726, pulseaudioSupport ? true, libpulseaudio ? null
2827}:
2928
@@ -101,9 +100,13 @@ in stdenv.mkDerivation rec {
101100 rm $out/bin/zoom
102101 # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect
103102 # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm:
103+ # Also clear Qt environment variables to prevent
104+ # zoom from tripping over "foreign" Qt ressources.
104105 makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \
105106 --run "cd $out/opt/zoom" \
106− --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps qttools.dev util-linux ]} \
107+ --unset QML2_IMPORT_PATH \
108+ --unset QT_PLUGIN_PATH \
109+ --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \
107110 --prefix LD_LIBRARY_PATH ":" ${libs}
108111
109112 # Backwards compatiblity: we used to call it zoom-us
pkgs/top-level/all-packages.nix+1−1
@@ -26553,7 +26553,7 @@ in
2655326553
2655426554 zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { };
2655526555
26556− zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { };
26556+ zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { };
2655726557
2655826558 zotero = callPackage ../applications/office/zotero { };
2655926559