kdeApps_15_04.libkgeomap: fix missing marble dependency

1 files changed, 9 insertions, 7 deletions

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 9de2f7a9fe15..213c70bfa235 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -36,6 +36,7 @@ let
       "Kipi" = "libkipi";
       "LibKMahjongg" = "libkmahjongg";
       "LibKonq" = "kde-baseapps";
+      "Marble" = "marble";
     };
 
   mkDerivation = drv: kf5.mkDerivation (drv // {
@@ -336,6 +337,14 @@ let
         buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
       };
 
+      libkgeomap = super.libkgeomap // {
+        cmakeFlags =
+          (super.libkgeomap.cmakeFlags or [])
+          ++ [
+            "-DCMAKE_MODULE_PATH=${kdeApps.marble}/share/apps/cmake/modules"
+          ];
+      };
+
       libkipi = with pkgs; super.libkipi // {
         buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
       };
@@ -344,13 +353,6 @@ let
         buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
       };
 
-      marble = super.marble // {
-        preConfigure = ''
-          ${super.preConfigure or ""}
-          cmakeFlags="$cmakeFlags -DCMAKE_MODULES_INSTALL_PATH=$out/lib/cmake"
-        '';
-      };
-
       rocs = super.rocs // {
         buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]);
       };