summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorLouis Bettens <louis@bettens.info>2020-05-16 22:15:56 +0200
committerLouis Bettens <louis@bettens.info>2020-05-17 17:04:29 +0200
commit8e5f5a54f204821f4418fe1f2a64771bd59d7936 (patch)
tree0bc5f557905c734662afa8e78403f47fb6785396 /pkgs/tools
parenteeb14812caca18d2f406292a5db38abc2aa4b2a5 (diff)
downloadnixpkgs-8e5f5a54f204821f4418fe1f2a64771bd59d7936.tar
nixpkgs-8e5f5a54f204821f4418fe1f2a64771bd59d7936.tar.gz
nixpkgs-8e5f5a54f204821f4418fe1f2a64771bd59d7936.tar.bz2
nixpkgs-8e5f5a54f204821f4418fe1f2a64771bd59d7936.tar.lz
nixpkgs-8e5f5a54f204821f4418fe1f2a64771bd59d7936.tar.xz
nixpkgs-8e5f5a54f204821f4418fe1f2a64771bd59d7936.tar.zst
nixpkgs-8e5f5a54f204821f4418fe1f2a64771bd59d7936.zip
xpra: avoid double-wrapping
Per manual: https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/X11/xpra/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index b33ca52146c..73381a141bc 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -89,8 +89,10 @@ in buildPythonApplication rec {
     "--with-vsock"
   ];
 
+  dontWrapGApps = true;
   preFixup = ''
-    gappsWrapperArgs+=(
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
       --set XPRA_INSTALL_PREFIX "$out"
       --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
       --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]}