diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-03-23 14:04:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-03-23 14:04:47 +0000 |
| commit | 9dd466d123a3b909a3e8eaca0eb8a958af2aa84f (patch) | |
| tree | 33430cf9fa37ec75a09de2bff41527f638fc3ede /pkgs/applications/misc/calibre | |
| parent | 1771bf00519e42f42888e6080d1f07d986fa53f2 (diff) | |
| download | nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar.gz nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar.bz2 nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar.lz nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar.xz nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.tar.zst nixlib-9dd466d123a3b909a3e8eaca0eb8a958af2aa84f.zip | |
* Updated pyqt and sip because the old versions have disappeared.
* Removed some unused versions of those packages. * Don't pass `lib' to packages (because we already have `stdenv.lib'). * Removed some `*_python26' variants because Python 2.6 is the default now. svn path=/nixpkgs/trunk/; revision=20782
Diffstat (limited to 'pkgs/applications/misc/calibre')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8ec1c5cd227a..f3664d854304 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,7 @@ -{stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng, -imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil, -pil, cssutils, beautifulsoap, makeWrapper, unrar}: +{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng +, imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil +, pil, cssutils, beautifulsoap, makeWrapper, unrar +}: stdenv.mkDerivation rec { name = "calibre-0.6.43"; @@ -12,9 +13,11 @@ stdenv.mkDerivation rec { inherit python; - buildInputs = [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick - libjpeg fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper cssutils - beautifulsoap ]; + buildInputs = + [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg + fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper + cssutils beautifulsoap + ]; installPhase = '' export HOME=$TMPDIR/fakehome |