swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #116355 from Yarny0/zoom-qt

Browse source
This commit is contained in:
Jörg Thalheim 2021-03-15 18:44:20 +00:00 committed by GitHub
parent bdc36a0210 e50d16f1ef
commit dc4f0a1721
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View file

@ -23,7 +23,6 @@
, pciutils
, procps
, util-linux
, qttools
, pulseaudioSupport ? true, libpulseaudio ? null
}:
@ -101,9 +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.
makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \
--run "cd $out/opt/zoom" \
--prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps qttools.dev util-linux ]} \
--unset QML2_IMPORT_PATH \
--unset QT_PLUGIN_PATH \
--prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \
--prefix LD_LIBRARY_PATH ":" ${libs}
# Backwards compatiblity: we used to call it zoom-us

2
pkgs/top-level/all-packages.nix
View file

@ -26553,7 +26553,7 @@ in
zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { };
zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { };
zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { };
zotero = callPackage ../applications/office/zotero { };