Set up kdegraphics section in kde 4.7

svn path=/nixpkgs/trunk/; revision=28210

9 files changed, 23 insertions, 33 deletions

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index ccfcb61c71b85..05f9d56ba0236 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -67,20 +67,12 @@ recurseIntoAttrs rec {
 
 ### OTHER MODULES
 
-  gwenview = callPackage ./gwenview.nix { };
-
-  okular = callPackage ./okular.nix { };
-
   konsole = callPackage ./konsole.nix { };
 
   kcolorchooser = callPackage ./kcolorchooser.nix { };
 
   kate = callPackage ./kate.nix { };
 
-  ksnapshot = callPackage ./ksnapshot.nix { };
-
-  kamera = callPackage ./kamera.nix { };
-
   kde_wallpapers = callPackage ./wallpapers.nix { };
 
   kdeadmin = callPackage ./admin.nix { };
@@ -89,10 +81,6 @@ recurseIntoAttrs rec {
   
   kdemultimedia = callPackage ./multimedia.nix { };
 
-  kolourpaint = callPackage ./kolourpaint.nix { };
-
-  kgamma = callPackage ./kgamma.nix { };
-
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     #jovie = callPackage ./accessibility/jovie.nix { };
     kmag = callPackage ./accessibility/kmag.nix { };
@@ -122,7 +110,17 @@ recurseIntoAttrs rec {
   kdenetwork = callPackage ./network { };
   kdeplasma_addons = callPackage ./plasma-addons { };
   */
-  
+
+  kdegraphics = combinePkgs "kdegraphics" {
+    gwenview = callPackage ./graphics/gwenview.nix { };
+    kamera = callPackage ./graphics/kamera.nix { };
+    kgamma = callPackage ./graphics/kgamma.nix { };
+    kolourpaint = callPackage ./graphics/kolourpaint.nix { };
+    kruler = callPackage ./graphics/kruler.nix { };
+    ksnapshot = callPackage ./graphics/ksnapshot.nix { };
+    okular = callPackage ./graphics/okular.nix { };
+  };
+
   kdesdk = combinePkgs "kdesdk" {
     cervisia = callPackage ./sdk/cervisia.nix { };
     kapptemplate = callPackage ./sdk/kapptemplate.nix { };
diff --git a/pkgs/desktops/kde-4.7/graphics/default.nix b/pkgs/desktops/kde-4.7/graphics/default.nix
deleted file mode 100644
index 36aeaf28019a2..0000000000000
--- a/pkgs/desktops/kde-4.7/graphics/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2
-, libspectre, popplerQt4, djvulibre, chmlib, shared_mime_info, libXxf86vm
-, kdelibs, automoc4, strigi, qimageblitz, soprano, qca2, ebook_tools }:
-
-kde.package {
-
-  buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre
-    (popplerQt4.override { inherit qt4; }) chmlib shared_mime_info libXxf86vm
-    kdelibs automoc4 strigi qimageblitz soprano qca2 djvulibre ebook_tools ];
-
-  meta = {
-    description = "KDE graphics utilities";
-    longDescription = ''
-      Contains various graphics utilities such as Gwenview image viewer and
-      Okular  document reader.
-    '';
-    license = "GPL";
-    kde.name = "kdegraphics";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/gwenview.nix b/pkgs/desktops/kde-4.7/graphics/gwenview.nix
index 26687c709a1a9..26687c709a1a9 100644
--- a/pkgs/desktops/kde-4.7/gwenview.nix
+++ b/pkgs/desktops/kde-4.7/graphics/gwenview.nix
diff --git a/pkgs/desktops/kde-4.7/kamera.nix b/pkgs/desktops/kde-4.7/graphics/kamera.nix
index 056136ecd1214..056136ecd1214 100644
--- a/pkgs/desktops/kde-4.7/kamera.nix
+++ b/pkgs/desktops/kde-4.7/graphics/kamera.nix
diff --git a/pkgs/desktops/kde-4.7/kgamma.nix b/pkgs/desktops/kde-4.7/graphics/kgamma.nix
index 017f7f00c7bea..017f7f00c7bea 100644
--- a/pkgs/desktops/kde-4.7/kgamma.nix
+++ b/pkgs/desktops/kde-4.7/graphics/kgamma.nix
diff --git a/pkgs/desktops/kde-4.7/kolourpaint.nix b/pkgs/desktops/kde-4.7/graphics/kolourpaint.nix
index 54565f1d27522..54565f1d27522 100644
--- a/pkgs/desktops/kde-4.7/kolourpaint.nix
+++ b/pkgs/desktops/kde-4.7/graphics/kolourpaint.nix
diff --git a/pkgs/desktops/kde-4.7/ksnapshot.nix b/pkgs/desktops/kde-4.7/graphics/ksnapshot.nix
index 6eadbd88c65bc..6eadbd88c65bc 100644
--- a/pkgs/desktops/kde-4.7/ksnapshot.nix
+++ b/pkgs/desktops/kde-4.7/graphics/ksnapshot.nix
diff --git a/pkgs/desktops/kde-4.7/okular.nix b/pkgs/desktops/kde-4.7/graphics/okular.nix
index 1b9ab5f2706ba..1b9ab5f2706ba 100644
--- a/pkgs/desktops/kde-4.7/okular.nix
+++ b/pkgs/desktops/kde-4.7/graphics/okular.nix
diff --git a/pkgs/desktops/kde-4.7/kruler.nix b/pkgs/desktops/kde-4.7/kruler.nix
new file mode 100644
index 0000000000000..5f1db6b4eda1c
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kruler.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4 }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+
+  meta = {
+    description = "KDE screen ruler";
+    license = "GPLv2";
+    kde.name = "kruler";
+  };
+}