* Added Okular (which is a separate package now).

svn path=/nixpkgs/branches/kde-4.7/; revision=27723

pkgs/applications/misc/djvulibre/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lib, useQt3 ? false, libjpeg, libtiff, libpng, ghostscript
 , libungif, zlib, x11, libX11, mesa, qt3 }:
 
-stdenv.mkDerivation {
-  name = "djvulibre-3.5.22";
+stdenv.mkDerivation rec {
+  name = "djvulibre-3.5.24";
 
   src = fetchurl {
-    url = mirror://sourceforge/djvu/djvulibre-3.5.22.tar.gz;
-    sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix";
+    url = "mirror://sourceforge/djvu/${name}.tar.gz";
+    sha256 = "0d1592cmc7scg2jzah47mnvbqldhxb1x9vxm7y64a3iasa0lqwy0";
   };
 
   buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++

pkgs/desktops/kde-4.7/default.nix

@@ -49,6 +49,8 @@ recurseIntoAttrs rec {
 
 ### OTHER MODULES
 
+  okular = callPackage ./okular.nix { };
+
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     colorSchemes = callPackage ./accessibility/color-schemes.nix { };
     iconThemes = callPackage ./accessibility/icon-themes.nix { };

pkgs/desktops/kde-4.7/okular.nix

@@ -0,0 +1,16 @@
+{ automoc4, chmlib, cmake, djvulibre, ebook_tools, kde, kdelibs, libspectre
+, popplerQt4, qca2, qimageblitz, qt4 }:
+
+kde.package {
+
+  buildInputs =
+    [ automoc4 chmlib cmake djvulibre ebook_tools kdelibs libspectre popplerQt4
+      qca2 qimageblitz qt4
+    ];
+
+  meta = {
+    description = "Okular, the KDE document viewer";
+    license = "GPLv2";
+    kde.name = "okular";
+  };
+}

pkgs/development/libraries/qimageblitz/default.nix

@@ -7,10 +7,12 @@ in
 
 stdenv.mkDerivation {
   name = "${pn}-${v}";
+  
   src = fetchurl {
     url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2";
     sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9";
   };
+  
   buildInputs = [ cmake qt4 ];
 
   meta = {