ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 06:14:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5 from aszlig/xpra

Browse Source 
New version of Xpra from the fork
This commit is contained in:
Peter Simons 2012-07-16 02:32:02 -07:00
commit 36265e9c66
3 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/interpreters/cython/default.nix Normal file
View File

@ -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";
buildInputs = [ python pkgconfig ];
meta = {
description = "An interpreter to help writing C extensions for Python";
};
}

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

@ -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 { stdenv.mkDerivation rec {
name = "xpra-0.0.3"; name = "xpra-0.3.2";
src = fetchurl { src = fetchurl {
url = http://partiwm.org/static/downloads/parti-all-0.0.3.tar.gz; url = http://xpra.org/src/xpra-0.3.2.tar.bz2;
sha256 = "17inksd4cc7mba2vfs17gz1yk3h6x6wf06pm3hcbs5scq8rr5bkp"; sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y";
}; };
#src = /home/eelco/Dev/nixpkgs/parti-all-0.0.3; buildNativeInputs = [ cython ];
buildInputs = [ buildInputs = [
pkgconfig python pyrex pygtk gtk makeWrapper pkgconfig python pygtk gtk ffmpeg x264 libvpx makeWrapper
xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst
]; ];
@ -21,19 +23,26 @@ stdenv.mkDerivation {
./do-build ./do-build
''; '';
pythonPaths = [
"$out/lib/python"
"$(toPythonPath ${pygtk})/gtk-2.0"
] ++ map (i: "$(toPythonPath ${i})") [
pygobject pycairo notify
];
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
cp -r install/* $out cp -r install/* $out
for i in $(cd $out/bin && ls); do for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \ 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" --prefix PATH : "${xlibs.xauth}/bin:${xlibs.xorgserver}/bin:${xlibs.xmodmap}/bin"
done done
''; '';
meta = { meta = {
homepage = http://partiwm.org/wiki/xpra; homepage = http://xpra.org/;
description = "Persistent remote applications for X"; description = "Persistent remote applications for X";
}; };
} }

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

@ -1785,6 +1785,8 @@ let
cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; 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 {
dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { }; dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { };
}; };
@ -7725,7 +7727,7 @@ let
}; };
xpra = callPackage ../tools/X11/xpra { xpra = callPackage ../tools/X11/xpra {
pyrex = pyrex095; inherit (pythonPackages) notify;
}; };
xscreensaver = callPackage ../misc/screensavers/xscreensaver { xscreensaver = callPackage ../misc/screensavers/xscreensaver {