diff options
| author | Lassulus <github@lassul.us> | 2020-08-23 09:09:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-23 09:09:57 +0200 |
| commit | 2df0a3e45304648bcf74a7567289235ec2af3d86 (patch) | |
| tree | 589df956d459130ac78033c05dd824739c693b47 /pkgs/tools | |
| parent | 243bb41e19db6a6730f36fba7f0e4fcd114fc63d (diff) | |
| parent | ead09d7e6ebb2b135a78fe1dfb4e3ef72cc99255 (diff) | |
| download | nixpkgs-2df0a3e45304648bcf74a7567289235ec2af3d86.tar nixpkgs-2df0a3e45304648bcf74a7567289235ec2af3d86.tar.gz nixpkgs-2df0a3e45304648bcf74a7567289235ec2af3d86.tar.bz2 nixpkgs-2df0a3e45304648bcf74a7567289235ec2af3d86.tar.lz nixpkgs-2df0a3e45304648bcf74a7567289235ec2af3d86.tar.xz nixpkgs-2df0a3e45304648bcf74a7567289235ec2af3d86.tar.zst nixpkgs-2df0a3e45304648bcf74a7567289235ec2af3d86.zip | |
Merge pull request #88021 from lourkeur/fix_xpra_doublewrapping
xpra: avoid double-wrapping
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 6fe433daf8b..7f46e017c36 100644 --- 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 ]} ) |