Merge pull request #88021 from lourkeur/fix_xpra_doublewrapping

xpra: avoid double-wrapping
This commit is contained in:
Lassulus 2020-08-23 09:09:57 +02:00 committed by GitHub
commit 2df0a3e453
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -90,9 +90,12 @@ in buildPythonApplication rec {
"--with-vsock"
];
dontWrapGApps = true;
preFixup = ''
gappsWrapperArgs+=(
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}"
--set XPRA_INSTALL_PREFIX "$out"
--set XPRA_COMMAND "$out/bin/xpra"
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
--prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]}
)