alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #13810 from ts468/upstream.xpra

Browse source 
xpra: 0.14.19/0.15.3 -> 0.16.2
This commit is contained in:
Domen Kožar 2016-03-10 12:35:04 +00:00
parent 721462634f 83b15e2fc4
commit 4471f144df
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/tools/X11/xpra/default.nix
View file

@ -6,12 +6,11 @@
, libfakeXinerama }:
buildPythonApplication rec {
name = "xpra-0.15.3";
name = "xpra-0.16.2";
namePrefix = "";
src = fetchurl {
url = "https://www.xpra.org/src/${name}.tar.xz";
sha256 = "1671r4ah2h0i3qbp27csck506n5y1zr9fv0869cv09knspa358i4";
url = "http://xpra.org/src/${name}.tar.xz";
sha256 = "0h55rv46byzv2g8g77bm0a0py8jpz3gbr5fhr5jy9sisyr0vk6ff";
};
buildInputs = [
@ -36,7 +35,7 @@ buildPythonApplication rec {
preBuild = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
'';
setupPyBuildFlags = ["--with-Xdummy"];
setupPyBuildFlags = ["--with-Xdummy" "--without-strict"];
preInstall = ''
# see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
@ -52,6 +51,8 @@ buildPythonApplication rec {
--prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
'';
preCheck = "exit 0";
#TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though
#postFixup = ''
# sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra

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

@ -6,14 +6,19 @@
, libfakeXinerama }:
buildPythonApplication rec {
name = "xpra-0.14.19";
name = "xpra-0.16.2";
namePrefix = "";
src = fetchurl {
url = "https://www.xpra.org/src/${name}.tar.xz";
sha256 = "0jifaysz4br1v0zibnzgd0k02rgybbsysvwrgbar1452sjb3db5m";
url = "http://xpra.org/src/${name}.tar.xz";
sha256 = "0h55rv46byzv2g8g77bm0a0py8jpz3gbr5fhr5jy9sisyr0vk6ff";
};
patchPhase = ''
substituteInPlace setup.py --replace 'pycairo' 'py3cairo'
substituteInPlace xpra/client/gtk3/cairo_workaround.pyx --replace 'pycairo/pycairo.h' 'py3cairo.h'
'';
buildInputs = [
pkgconfig
@ -36,8 +41,7 @@ buildPythonApplication rec {
preBuild = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)"
'';
setupPyBuildFlags = [ "--with-gtk3" "--without-gtk2" "--with-Xdummy" ];
setupPyBuildFlags = [ "--without-strict" "--with-gtk3" "--without-gtk2" "--with-Xdummy" ];
preInstall = ''
# see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
@ -53,6 +57,9 @@ buildPythonApplication rec {
--prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
'';
preCheck = "exit 0";
doInstallCheck = false;
#TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though
#postFixup = ''
# sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra