mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 04:02:55 +03:00
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.
This commit is contained in:
parent
57f9bfbd48
commit
3b289ec996
@ -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]
|
||||
|
Loading…
Reference in New Issue
Block a user