Skip to content

xpra: fix #41106#87982

Merged
offlinehacker merged 1 commit intoNixOS:masterfrom
bbjubjub2494:fix_41106
May 20, 2020
Merged

xpra: fix #41106#87982
offlinehacker merged 1 commit intoNixOS:masterfrom
bbjubjub2494:fix_41106

Conversation

@bbjubjub2494
Copy link
Member

@bbjubjub2494 bbjubjub2494 commented May 16, 2020 •
edited
Loading

Motivation for this change

Fix #41106

Things done

A Python SyntaxError is raised when Xpra attempts to explicitly invoke python on the generated wrapper. To prevent that, we make it bypass the wrapper. The environment variables should still be correct because Xpra makes an effort to preserve the environment.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 16, 2020
@bbjubjub2494 bbjubjub2494 changed the title Fix xpra wrapper issues xpra: fix wrapper issues May 16, 2020
@bbjubjub2494
Copy link
Member Author

bbjubjub2494 commented May 16, 2020

Looksk like I hit the wrong thing: xpra-wrapped starts by assigning sys.argv[0].

@mjlbach mjlbach mentioned this pull request May 17, 2020
Open
6 tasks
@bbjubjub2494
Copy link
Member Author

bbjubjub2494 commented May 17, 2020 •
edited
Loading

So to test:

  1. start xpra in daemon mode (with the nixos/xpra: xpra_Xdummy 3.0 crashes #85694 countermeasure)
$ xpra start --fake-xinerama=no :100
  1. attach
$ xpra attach :100
  1. Check attach output for SyntaxErrors. There should be none iff the patch is applied.
$ tail -f /run/user/1001/xpra/:100.log

@bbjubjub2494 bbjubjub2494 changed the title xpra: fix wrapper issues xpra: fix #41106 May 17, 2020
@bbjubjub2494 bbjubjub2494 marked this pull request as ready for review May 17, 2020 15:06
@mjlbach mjlbach mentioned this pull request May 17, 2020
Closed
@offlinehacker offlinehacker merged commit f7394da into NixOS:master May 20, 2020
@bbjubjub2494 bbjubjub2494 mentioned this pull request May 22, 2020
Merged
10 tasks
@bbjubjub2494 bbjubjub2494 deleted the fix_41106 branch June 3, 2020 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

xpra wrapper breaks xpra start

2 participants

@bbjubjub2494 @offlinehacker