Merge pull request #88021 from lourkeur/fix_xpra_doublewrapping

xpra: avoid double-wrapping
2020-08-23 09:09:57 +02:00 · 2020-08-23 09:09:57 +02:00 · 2df0a3e453
commit 2df0a3e453
parent 243bb41e19 ead09d7e6e
1 changed files with 4 additions and 1 deletions
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@ -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 ]}
    )