Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c5d076ef993e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f7394da48a21
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 17, 2020

  1. xpra: fix #41106

    Louis Bettens committed May 17, 2020
    Copy the full SHA
    4459844 View commit details

Commits on May 20, 2020

  1. Merge pull request #87982 from lourkeur/fix_41106 

    xpra: fix #41106
    @offlinehacker
    offlinehacker authored May 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f7394da View commit details
Showing with 16 additions and 0 deletions.
  1. +1 −0 pkgs/tools/X11/xpra/default.nix
  2. +15 −0 pkgs/tools/X11/xpra/fix-41106.patch
1 change: 1 addition & 0 deletions pkgs/tools/X11/xpra/default.nix
View file
Original file line number Diff line number Diff line change
@@ -42,6 +42,7 @@ in buildPythonApplication rec {
src = ./fix-paths.patch;
inherit (xorg) xkeyboardconfig;
})
./fix-41106.patch
];

postPatch = ''
15 changes: 15 additions & 0 deletions pkgs/tools/X11/xpra/fix-41106.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py
index 2ff2c0c..513201a 100644
--- a/xpra/server/server_util.py
+++ b/xpra/server/server_util.py
@@ -17,6 +17,10 @@ if PYTHON3:
return b"'" + s.replace(b"'", b"'\\''") + b"'"

def xpra_runner_shell_script(xpra_file, starting_dir, socket_dir):
+ # Nixpkgs contortion:
+ # xpra_file points to a shell wrapper, not to the python script.
+ dirname, basename = os.path.split(xpra_file)
+ xpra_file = os.path.join(dirname, "."+basename+"-wrapped")
script = []
script.append(b"#!/bin/sh\n")
for var, value in os.environb.items():