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

Adding calibre. This involved also:

Browse Source 
- Adding podofo
- Adding some new python packages
- Making new pkgs attributes for python packages to build with python 2.6
- Updating some python packages expressions to allow python 2.6, and not only 2.5.


svn path=/nixpkgs/trunk/; revision=19303
This commit is contained in:
Lluís Batlle i Rossell
2010-01-07 22:47:30 +00:00
parent de6f189743
commit a4473b8205
7 changed files with 149 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/pyqt/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation {
url = http://pyqwt.sourceforge.net/support/PyQt-x11-gpl-4.5.4.tar.gz; # Not downloading from riverbank, since they remove older releases
sha256 = "1a55zng6yhnbk5swc02bkbyccdgf0f0v94yxk9v5a43hv9xnrl5k";
};
configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/python2.5/site-packages -v $out/share/sip -p $out/plugins";
configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins";
buildInputs = [ python sip qt4 ];
meta = {
description = "Python bindings for Qt";

2
pkgs/development/python-modules/python-sip/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation {
url = http://pyqwt.sourceforge.net/support/sip-4.8.2.tar.gz; # Not downloading from riverbank, since they remove older releases
sha256 = "1afr2qaibzgf8fq4fmc31jz9hvbwxbg5jvl68ygvkkdvnbg2kfrf";
};
configurePhase = "python ./configure.py -d $out/lib/python2.5/site-packages -b $out/bin -e $out/include";
configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
buildInputs = [ python ];
meta = {
description = "Creates C++ bindings for Python modules";

6
pkgs/development/python-modules/setuptools/default.nix
View File

@@ -29,16 +29,16 @@ rec {
'') ["addInputs" "doUnpack"];
doInstall = a.fullDepEntry(''
ensureDir "$out/lib/python2.5/site-packages"
ensureDir "$out/lib/${a.python.libPrefix}/site-packages"
PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \
PYTHONPATH="$out/lib/${a.python.libPrefix}/site-packages:$PYTHONPATH" \
python setup.py install --prefix="$out"
for i in "$out/bin/"*
do
wrapProgram "$i" \
--prefix PYTHONPATH ":" \
"$out/lib/python2.5/site-packages"
"$out/lib/${a.python.libPrefix}/site-packages"
done
'') ["doBuild"];