git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #88021 from lourkeur/fix_xpra_doublewrapping

xpra: avoid double-wrapping

commit2df0a3e45304648bcf74a7567289235ec2af3d86 authorLassulus <github@lassul.us> dateSun 23 Aug 2020, 09:09 (6 years ago) parent243bb41ead09d7
1 file changed+4−1
pkgs/tools/X11/xpra/default.nix+4−1
pkgs/tools/X11/xpra/default.nix+4−1
@@ -90,9 +90,12 @@ in buildPythonApplication rec {
9090 "--with-vsock"
9191 ];
9292
93+ dontWrapGApps = true;
9394 preFixup = ''
94− gappsWrapperArgs+=(
95+ makeWrapperArgs+=(
96+ "''${gappsWrapperArgs[@]}"
9597 --set XPRA_INSTALL_PREFIX "$out"
98+ --set XPRA_COMMAND "$out/bin/xpra"
9699 --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
97100 --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]}
98101 )