MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xpraGtk3: point to xpra

Browse source 
xpra now uses GTK 3
This commit is contained in:
Jan Tojnar 2018-09-13 17:45:42 +02:00
parent 3b685ee517
commit d4d87b049b
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
3 changed files with 1 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
pkgs/tools/X11/xpra/gtk3.nix
View file

@ -1,79 +0,0 @@
{ stdenv, fetchurl, buildPythonApplication
, python, cython, pkgconfig
, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection
, makeWrapper, xorgserver, getopt, xauth, utillinux, which, fontsConf
, ffmpeg, x264, libvpx, libwebp
, libfakeXinerama, pam }:
buildPythonApplication rec {
name = "xpra-${version}";
version = "2.2.5";
src = fetchurl {
url = "https://xpra.org/src/${name}.tar.xz";
sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js";
};
patchPhase = ''
substituteInPlace setup.py --replace 'pycairo' 'py3cairo'
substituteInPlace xpra/client/gtk3/cairo_workaround.pyx --replace 'pycairo/pycairo.h' 'py3cairo.h'
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage
xorg.libXrandr xorg.libxkbfile
pango cairo gdk_pixbuf atk gtk3 glib gobjectIntrospection
ffmpeg libvpx x264 libwebp
makeWrapper
pam
];
propagatedBuildInputs = [
pygobject3 pycairo cython
];
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" ];
preInstall = ''
# see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out
sed -i '/ = data_files/d' setup.py
'';
postInstall = ''
wrapProgram $out/bin/xpra \
--set FONTCONFIG_FILE "${fontsConf}" \
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
--prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}
'';
preCheck = "exit 0";
doInstallCheck = false;
#TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though
#postFixup = ''
# sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
# sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra
#'';
meta = with stdenv.lib; {
homepage = http://xpra.org/;
downloadPage = "https://xpra.org/src/";
downloadURLRegexp = "xpra-.*[.]tar[.]xz$";
description = "Persistent remote applications for X";
platforms = platforms.linux;
license = licenses.gpl2;
};
}

1
pkgs/top-level/aliases.nix
View file

@ -310,6 +310,7 @@ mapAliases ({
xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
xlibs = xorg; # added 2015-09
xpraGtk3 = xpra; # added 2018-09-13
youtubeDL = youtube-dl; # added 2014-10-26
# added 2017-05-27

2
pkgs/top-level/all-packages.nix
View file

@ -19681,8 +19681,6 @@ with pkgs;
xpra = callPackage ../tools/X11/xpra { };
libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
#TODO: 'pil' is not available for python3, yet
xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; };
xrectsel = callPackage ../tools/X11/xrectsel { };