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

Add calibreQt46. Please, test

Browse Source 
svn path=/nixpkgs/trunk/; revision=21014
This commit is contained in:
Yury G. Kudryashov 2010-04-11 18:58:43 +00:00
parent afe0368b9a
commit 64cff1da4e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5362,8 +5362,6 @@ let
inherit stdenv fetchurl rpm cpio python wirelesstools gettext; inherit stdenv fetchurl rpm cpio python wirelesstools gettext;
}; };
sip = sip48;
sip48 = import ../development/python-modules/python-sip { sip48 = import ../development/python-modules/python-sip {
inherit stdenv fetchurl python; inherit stdenv fetchurl python;
}; };
@ -5372,11 +5370,10 @@ let
inherit stdenv fetchurl python; inherit stdenv fetchurl python;
}; };
pyqt4 = pyqt45;
pyqt45 = import ../development/python-modules/pyqt { pyqt45 = import ../development/python-modules/pyqt {
inherit stdenv fetchurl python sip; inherit stdenv fetchurl python;
qt4 = qt45; qt4 = qt45;
sip = sip48;
}; };
pyqt47 = import ../development/python-modules/pyqt/4.7.nix { pyqt47 = import ../development/python-modules/pyqt/4.7.nix {
@ -6866,14 +6863,22 @@ let
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };
calibre = import ../applications/misc/calibre { calibre = makeOverridable (import ../applications/misc/calibre) {
inherit stdenv fetchurl libpng imagemagick pkgconfig libjpeg fontconfig podofo inherit stdenv fetchurl libpng imagemagick pkgconfig libjpeg fontconfig podofo
qt4 makeWrapper unrar sip pyqt4 pil chmlib; qt4 makeWrapper unrar pil chmlib;
python = python26Full; python = python26Full;
popplerQt4 = popplerQt45; popplerQt4 = popplerQt45;
pyqt4 = pyqt45;
sip = sip48;
inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap; inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap;
}; };
calibreQt46 = calibre.override {
popplerQt4 = popplerQt46;
pyqt4 = pyqt47;
sip = sip410;
};
carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
gtkspell aspell gettext ncurses avahi dbus dbus_glib python gtkspell aspell gettext ncurses avahi dbus dbus_glib python