diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-06-24 13:13:26 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-06-30 14:42:16 +0200 |
commit | 6d48539fdb25b0bf2772352614707a9f23628e7e (patch) | |
tree | 9a4ab2856d260df4583303fa1e72356a6e5d53e8 /pkgs | |
parent | d71ef00b9dff04f72de9d0d64e719125d1e3d5c3 (diff) | |
download | nixlib-6d48539fdb25b0bf2772352614707a9f23628e7e.tar nixlib-6d48539fdb25b0bf2772352614707a9f23628e7e.tar.gz nixlib-6d48539fdb25b0bf2772352614707a9f23628e7e.tar.bz2 nixlib-6d48539fdb25b0bf2772352614707a9f23628e7e.tar.lz nixlib-6d48539fdb25b0bf2772352614707a9f23628e7e.tar.xz nixlib-6d48539fdb25b0bf2772352614707a9f23628e7e.tar.zst nixlib-6d48539fdb25b0bf2772352614707a9f23628e7e.zip |
xpra: fix some runtime issues
* Add missing modules (fixes warnings and errors). * Step 1 to unbreak starting Xvfb by making xpra invoke it with valid log dir ($HOME/.xpra). Without this fix, it is invoked with ~/.xpra, which Xvfb doesn't know how to interpret and uses it literally (fail). Step 2 will be fixing an Xvfb permission issue: "xf86OpenConsole: Cannot open virtual console 1 (Permission denied)". * Use XPRA_INSTALL_PREFIX to make it find its icons.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 0c33ed5b9acd..cbab2d4e9cd6 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - pillow pygtk pygobject rencode + pillow pygtk pygobject rencode pycrypto cryptography pycups lz4 dbus ]; preBuild = '' @@ -47,6 +47,8 @@ buildPythonApplication rec { wrapProgram $out/bin/xpra \ --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ + --set XPRA_LOG_DIR "\$HOME/.xpra" \ + --set XPRA_INSTALL_PREFIX "$out" \ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin ''; |