From 2f36cbcdda1c49a599ce0a1d25f3c1d32a395b05 Mon Sep 17 00:00:00 2001 From: Gabriel Volpe Date: Sun, 6 Oct 2024 20:35:17 +0200 Subject: [PATCH] zoom-us: add conditional webview fix --- pkgs/by-name/zo/zoom-us/package.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 14d853e30b7c..23f909a274e6 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -115,7 +115,7 @@ let binPath = lib.makeBinPath ([ coreutils glib.dev pciutils procps util-linux ] ++ lib.optional pulseaudioSupport pulseaudio); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zoom"; version = versions.${system} or throwSystem; @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/zoom.us.app/Contents/MacOS/zoom.us $out/bin/zoom '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Desktop File @@ -161,7 +161,9 @@ stdenv.mkDerivation rec { --replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" for i in aomhost zopen zoom ZoomLauncher ZoomWebviewHost; do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i + if [ -f $out/opt/zoom/$i ]; then + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i + fi done # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom @@ -183,11 +185,13 @@ stdenv.mkDerivation rec { --prefix PATH : ${binPath} \ --prefix LD_LIBRARY_PATH ":" ${libs} - wrapProgram $out/opt/zoom/ZoomWebviewHost \ - --unset QML2_IMPORT_PATH \ - --unset QT_PLUGIN_PATH \ - --unset QT_SCREEN_SCALE_FACTORS \ - --prefix LD_LIBRARY_PATH ":" ${libs} + if [ -f $out/opt/zoom/ZoomWebviewHost ]; then + wrapProgram $out/opt/zoom/ZoomWebviewHost \ + --unset QML2_IMPORT_PATH \ + --unset QT_PLUGIN_PATH \ + --unset QT_SCREEN_SCALE_FACTORS \ + --prefix LD_LIBRARY_PATH ":" ${libs} + fi # Backwards compatibility: we used to call it zoom-us ln -s $out/bin/{zoom,zoom-us}