From 64cff1da4e6fca4e1fa857264d3333c6fd52b31f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 11 Apr 2010 18:58:43 +0000
Subject: [PATCH] Add calibreQt46. Please, test

svn path=/nixpkgs/trunk/; revision=21014
---
 pkgs/top-level/all-packages.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebacbee45990..82232107832e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5362,8 +5362,6 @@ let
     inherit stdenv fetchurl rpm cpio python wirelesstools gettext;
   };
 
-  sip = sip48;
-
   sip48 = import ../development/python-modules/python-sip {
     inherit stdenv fetchurl python;
   };
@@ -5372,11 +5370,10 @@ let
     inherit stdenv fetchurl python;
   };
 
-  pyqt4 = pyqt45;
-  
   pyqt45 = import ../development/python-modules/pyqt {
-    inherit stdenv fetchurl python sip;
+    inherit stdenv fetchurl python;
     qt4 = qt45;
+    sip = sip48;
   };
 
   pyqt47 = import ../development/python-modules/pyqt/4.7.nix {
@@ -6866,14 +6863,22 @@ let
     inherit fetchurl stdenv ncurses;
   };
 
-  calibre = import ../applications/misc/calibre {
+  calibre = makeOverridable (import ../applications/misc/calibre) {
     inherit stdenv fetchurl libpng imagemagick pkgconfig libjpeg fontconfig podofo
-      qt4 makeWrapper unrar sip pyqt4 pil chmlib;
+      qt4 makeWrapper unrar pil chmlib;
     python = python26Full;
     popplerQt4 = popplerQt45;
+    pyqt4 = pyqt45;
+    sip = sip48;
     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) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
       gtkspell aspell gettext ncurses avahi dbus dbus_glib python