about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDanylo Hlynskyi <abcz2.uprola@gmail.com>2020-02-14 16:16:02 +0200
committerGitHub <noreply@github.com>2020-02-14 16:16:02 +0200
commit854638ea2953b9285379840abba539fd559d5712 (patch)
tree7b033c4389054b5ff6149f2f680718d598113c87
parent8c7f9beef44599cad3f4ac663c76f05c3bad8553 (diff)
downloadnixlib-854638ea2953b9285379840abba539fd559d5712.tar
nixlib-854638ea2953b9285379840abba539fd559d5712.tar.gz
nixlib-854638ea2953b9285379840abba539fd559d5712.tar.bz2
nixlib-854638ea2953b9285379840abba539fd559d5712.tar.lz
nixlib-854638ea2953b9285379840abba539fd559d5712.tar.xz
nixlib-854638ea2953b9285379840abba539fd559d5712.tar.zst
nixlib-854638ea2953b9285379840abba539fd559d5712.zip
zoom-us: fix launch (#80005)
zoom-us: fix launch

Probably due to glibc update, ZoomLauncher became broken when v4l is present in
LD_PRELOAD path. It can be fixed by a) removing ZoomLauncher from startup chain,
so `zoom` is started directly or b) removing v4l from LD_PRELOAD.

The reason v4l was added before was because my video was rotated upside down without it.
Seem like nowadays this is fixed by Zoom itself, so I'm removing it.

Fixes https://github.com/NixOS/nixpkgs/issues/79954

Co-authored-by: @mmlb
-rw-r--r--pkgs/applications/networking/instant-messengers/zoom-us/default.nix3
1 files changed, 1 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 cc19bbd7156f..d22c1cefc2f4 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -5,7 +5,7 @@
 , qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg
 , qttools, qtwayland, qtwebchannel, qtwebengine
 # Runtime
-, coreutils, libjpeg_turbo, pciutils, procps, utillinux, libv4l
+, coreutils, libjpeg_turbo, pciutils, procps, utillinux
 , pulseaudioSupport ? true, libpulseaudio ? null
 }:
 
@@ -101,7 +101,6 @@ in mkDerivation {
 
   qtWrapperArgs = [
     ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}''
-    ''--prefix LD_PRELOAD : ${libv4l}/lib/libv4l/v4l2convert.so''
     # --run "cd ${placeholder "out"}/share/zoom-us"
     # ^^ unfortunately, breaks run arg into multiple array elements, due to
     # some bad array propagation. We'll do that in bash below