mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-31 20:54:56 +00:00
17 lines
840 B
Diff
17 lines
840 B
Diff
--- a/xpra/scripts/main.py
|
|
+++ b/xpra/scripts/main.py
|
|
@@ -536,13 +536,7 @@
|
|
"upgrade", "upgrade-seamless", "upgrade-desktop",
|
|
"encoder", "runner",
|
|
) and not display_is_remote and options.daemon and use_systemd_run(options.systemd_run):
|
|
- # make sure we run via the same interpreter,
|
|
- # inject it into the command line if we have to:
|
|
argv = list(cmdline)
|
|
- if argv[0].find("python") < 0:
|
|
- major, minor = sys.version_info.major, sys.version_info.minor
|
|
- python = which("python%i.%i" % (major, minor)) or which("python%i" % major) or which("python") or "python"
|
|
- argv.insert(0, python)
|
|
return systemd_run_wrap(mode, argv, options.systemd_run_args, user=getuid() != 0)
|
|
configure_env(options.env)
|
|
configure_logging(options, mode)
|