Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New version of Xpra from the fork #5

Merged
merged 4 commits into from
Jul 16, 2012
Merged

New version of Xpra from the fork #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af9924b
Add Cython, because it's needed to build xpra.
aszlig Jun 5, 2012
d802bac
xpra: New version from the fork.
aszlig Jun 5, 2012
5cf8899
xpra: Don't include cython into store requisites.
aszlig Jul 6, 2012
ceff799
xpra: Add python notify module.
aszlig Jul 6, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions pkgs/development/interpreters/cython/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{ stdenv, fetchurl, python, pkgconfig }:

stdenv.mkDerivation {
name = "cython-0.16";

src = fetchurl {
url = http://www.cython.org/release/Cython-0.16.tar.gz;
sha256 = "1yz6jwv25xx5mbr2nm4l7mi65gvpm63dzi3vrw73p51wbpy525lp";
};

buildPhase = "python setup.py build --build-base $out";

installPhase = "python setup.py install --prefix=$out";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This package should probably be moved into the pythonPackages set and use the buildPythonPackage function. Other than that it looks good to me.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because it's actually not really a python package itself but an alternative to the python interpreter, such as pyrex (it is actually a fork of that). It generates C code (and after that a .so) out of a python file with special syntax/annotations, such as C type annotations/defines.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@edolstra Does @aszlig still need to move to pythonPackages and use buildPythonPackage, or is this good enough to merge?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aszlig Your reasoning makes sense to me for why this isn't in pythonPackages, but wouldn't buildPythonPackage still help here?


buildInputs = [ python pkgconfig ];

meta = {
description = "An interpreter to help writing C extensions for Python";
};
}
27 changes: 18 additions & 9 deletions pkgs/tools/X11/xpra/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
{stdenv, fetchurl, pkgconfig, python, pyrex, pygtk, xlibs, gtk, makeWrapper}:
{ stdenv, fetchurl, pkgconfig, python, cython
, pygtk, pygobject, pycairo, notify, xlibs, gtk
, ffmpeg, x264, libvpx, makeWrapper}:

stdenv.mkDerivation {
name = "xpra-0.0.3";
stdenv.mkDerivation rec {
name = "xpra-0.3.2";

src = fetchurl {
url = http://partiwm.org/static/downloads/parti-all-0.0.3.tar.gz;
sha256 = "17inksd4cc7mba2vfs17gz1yk3h6x6wf06pm3hcbs5scq8rr5bkp";
url = http://xpra.org/src/xpra-0.3.2.tar.bz2;
sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y";
};

#src = /home/eelco/Dev/nixpkgs/parti-all-0.0.3;
buildNativeInputs = [ cython ];

buildInputs = [
pkgconfig python pyrex pygtk gtk makeWrapper
pkgconfig python pygtk gtk ffmpeg x264 libvpx makeWrapper
xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst
];

Expand All @@ -21,19 +23,26 @@ stdenv.mkDerivation {
./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 "$out/lib/python:$(toPythonPath ${pygtk})/gtk-2.0:$PYTHONPATH" \
--set PYTHONPATH "${stdenv.lib.concatStringsSep ":" pythonPaths}" \
--prefix PATH : "${xlibs.xauth}/bin:${xlibs.xorgserver}/bin:${xlibs.xmodmap}/bin"
done
'';

meta = {
homepage = http://partiwm.org/wiki/xpra;
homepage = http://xpra.org/;
description = "Persistent remote applications for X";
};
}
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1777,6 +1777,8 @@ let

cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };

cython = callPackage ../development/interpreters/cython { };

dylan = callPackage ../development/compilers/gwydion-dylan {
dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { };
};
Expand Down Expand Up @@ -7682,7 +7684,7 @@ let
};

xpra = callPackage ../tools/X11/xpra {
pyrex = pyrex095;
inherit (pythonPackages) notify;
};

xscreensaver = callPackage ../misc/screensavers/xscreensaver {
Expand Down