about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2017-08-02 21:07:19 -0700
committerRobin Gloster <mail@glob.in>2017-08-04 03:34:53 +0200
commit3b289ec99672445a7face0e9d395bc3074eb5484 (patch)
treebbb5e0eeb69924d56641135b183f75248270d186 /pkgs/applications/networking/instant-messengers/zoom-us/default.nix
parent57f9bfbd48a759676ba310f069124d63e7082e6c (diff)
downloadnixlib-3b289ec99672445a7face0e9d395bc3074eb5484.tar
nixlib-3b289ec99672445a7face0e9d395bc3074eb5484.tar.gz
nixlib-3b289ec99672445a7face0e9d395bc3074eb5484.tar.bz2
nixlib-3b289ec99672445a7face0e9d395bc3074eb5484.tar.lz
nixlib-3b289ec99672445a7face0e9d395bc3074eb5484.tar.xz
nixlib-3b289ec99672445a7face0e9d395bc3074eb5484.tar.zst
nixlib-3b289ec99672445a7face0e9d395bc3074eb5484.zip
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.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/zoom-us/default.nix')
-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 aa34866b2af4..33ad9981b350 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 <<EOF
     [Paths]