public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrading xpra to 0.8.8

Browse Source
This commit is contained in:
Jaka Hudoklin 2013-03-29 02:30:18 +01:00
parent e48bbe4c39
commit 06425fca37
2 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
pkgs/tools/X11/xpra/default.nix
View File

@ -1,44 +1,40 @@
{ stdenv, fetchurl, pkgconfig, python, cython { stdenv, fetchurl, buildPythonPackage
, pygtk, pygobject, pycairo, notify, xlibs, gtk , python, cython, pkgconfig
, ffmpeg, x264, libvpx, makeWrapper}: , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo
, ffmpeg_1_1, x264, libvpx, pil, libwebp }:
stdenv.mkDerivation rec { buildPythonPackage rec {
name = "xpra-0.3.2"; name = "xpra-0.8.8";
src = fetchurl { src = fetchurl {
url = http://xpra.org/src/xpra-0.3.2.tar.bz2; url = "http://xpra.org/src/${name}.tar.bz2";
sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y"; sha256 = "248bac50c78eccfbc7f728667f9d0ef26b101b288193fa286881cda452e63683";
}; };
nativeBuildInputs = [ cython ]; buildInputs = [
python cython pkgconfig
buildInputs = [ xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
pkgconfig python pygtk gtk ffmpeg x264 libvpx makeWrapper xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage
xorg.libXrandr
pango cairo gdk_pixbuf atk gtk glib
ffmpeg_1_1 libvpx x264 libwebp
]; ];
propagatedBuildInputs = [
pil pygtk pygobject
];
# Even after i tried monkey patching, their tests just fail, looks like
# they don't have automated testing out of the box? http://xpra.org/trac/ticket/177
doCheck = false;
buildPhase = '' buildPhase = ''
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0)" NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
NIX_LDFLAGS="$NIX_LDFLAGS -lXcomposite -lXdamage" python ./setup.py build --enable-Xdummy
./do-build
'';
pythonPaths = [
"$out/lib/python"
"$(toPythonPath ${pygtk})/gtk-2.0"
] ++ map (i: "$(toPythonPath ${i})") [
pygobject pycairo notify
];
installPhase = ''
mkdir -p $out
cp -r install/* $out
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--set PYTHONPATH "${stdenv.lib.concatStringsSep ":" pythonPaths}" \
--prefix PATH : "${xlibs.xauth}/bin:${xlibs.xorgserver}/bin:${xlibs.xmodmap}/bin"
done
''; '';
meta = { meta = {

4
pkgs/top-level/all-packages.nix
View File

@ -8066,9 +8066,7 @@ let
libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
xpra = callPackage ../tools/X11/xpra { xpra = callPackage ../tools/X11/xpra { };
inherit (pythonPackages) notify;
};
xscreensaver = callPackage ../misc/screensavers/xscreensaver { xscreensaver = callPackage ../misc/screensavers/xscreensaver {
inherit (gnome) libglade; inherit (gnome) libglade;