From 3b289ec99672445a7face0e9d395bc3074eb5484 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Wed, 2 Aug 2017 21:07:19 -0700 Subject: [PATCH] zoom-us: use makeWrapper instead of wrapProgram Since the program to be wrapped is already in a different path than $out/bin, we don't need the complicated dance that wrapProgram uses to put the wrapper in the same location as the original program. Just tell makeWrapper to put the wrapper in the final desired output location instead. --- .../networking/instant-messengers/zoom-us/default.nix | 3 +-- 1 file changed, 1 insertion(+), 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 aa34866b2af..33ad9981b35 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -75,13 +75,12 @@ in stdenv.mkDerivation { #paxmark m $packagePath/QtWebEngineProcess # is this what dtzWill talked about? # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it - wrapProgram $packagePath/zoom \ + makeWrapper $packagePath/zoom $out/bin/zoom-us \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" - ln -s "$packagePath/zoom" "$out/bin/zoom-us" cat > $packagePath/qt.conf <