diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2017-11-11 13:00:17 +0100 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2017-11-11 13:03:36 +0100 |
commit | 048384228696bfc835229e33a9b10b220dd2a5f5 (patch) | |
tree | 896e195c7cdb9dd5c66755a0e38cd2c3b8c5ece0 /pkgs/tools/X11/xpra/gtk3.nix | |
parent | 6bedd0b821363236fc970682c895ef05a62218c7 (diff) | |
download | nixlib-048384228696bfc835229e33a9b10b220dd2a5f5.tar nixlib-048384228696bfc835229e33a9b10b220dd2a5f5.tar.gz nixlib-048384228696bfc835229e33a9b10b220dd2a5f5.tar.bz2 nixlib-048384228696bfc835229e33a9b10b220dd2a5f5.tar.lz nixlib-048384228696bfc835229e33a9b10b220dd2a5f5.tar.xz nixlib-048384228696bfc835229e33a9b10b220dd2a5f5.tar.zst nixlib-048384228696bfc835229e33a9b10b220dd2a5f5.zip |
xpra: 2.0.2 -> 2.1.3; xpraGtk3: 0.16.2 -> 2.1.3
Diffstat (limited to 'pkgs/tools/X11/xpra/gtk3.nix')
-rw-r--r-- | pkgs/tools/X11/xpra/gtk3.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 92f1827156b6..629c10f867fa 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -3,15 +3,15 @@ , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp -, libfakeXinerama }: +, libfakeXinerama, pam }: buildPythonApplication rec { - name = "xpra-0.16.2"; - namePrefix = ""; + name = "xpra-${version}"; + version = "2.1.3"; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "0h55rv46byzv2g8g77bm0a0py8jpz3gbr5fhr5jy9sisyr0vk6ff"; + sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm"; }; patchPhase = '' @@ -31,6 +31,8 @@ buildPythonApplication rec { ffmpeg libvpx x264 libwebp makeWrapper + + pam ]; propagatedBuildInputs = [ @@ -39,6 +41,7 @@ buildPythonApplication rec { preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)" + substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so" ''; setupPyBuildFlags = [ "--without-strict" "--with-gtk3" "--without-gtk2" "--with-Xdummy" ]; @@ -67,6 +70,8 @@ buildPythonApplication rec { meta = { homepage = http://xpra.org/; + downloadPage = "https://xpra.org/src/"; + downloadURLRegexp = "xpra-.*[.]tar[.]xz$"; description = "Persistent remote applications for X"; platforms = stdenv.lib.platforms.linux; }; |