diff options
author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2017-03-05 01:32:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-05 01:32:23 +0100 |
commit | f5d81ed79b7e9085aa24d8b3006d6da7718e5694 (patch) | |
tree | afccd5b777472009a20c2c31e2884527ad919f81 /pkgs/tools | |
parent | 3f817d09b9ea4361b51106a659d9ce349f29c011 (diff) | |
parent | b72f8ccc5cb86a8f81768a74dd2beb5022f50969 (diff) |
Merge pull request #20904 from offlinehacker/nixos/xserver/xpra
Add xpra display-manager
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index eadae7ad3c45..6349633af66b 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -3,7 +3,8 @@ , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama -, gst_all_1, pulseaudioLight, gobjectIntrospection }: +, gst_all_1, pulseaudioLight, gobjectIntrospection +, pam }: with lib; @@ -36,16 +37,19 @@ in buildPythonApplication rec { gst_all_1.gst-plugins-bad gst_all_1.gst-libav + pam + makeWrapper ]; propagatedBuildInputs = with python2Packages; [ pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python - netifaces numpy websockify pygobject3 gst-python + netifaces numpy websockify pygobject3 gst-python pam ]; preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" + substituteInPlace xpra/server/auth/pam.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so" ''; setupPyBuildFlags = ["--with-Xdummy" "--without-strict"]; @@ -57,13 +61,11 @@ in buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/xpra \ - --set FONTCONFIG_FILE "${fontsConf}" \ - --set XPRA_LOG_DIR "\$HOME/.xpra" \ --set XPRA_INSTALL_PREFIX "$out" \ --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ - --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]} \ + --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ + --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]} ''; preCheck = "exit 0"; |