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

kdeApps_15_04.libkgeomap: fix missing marble dependency

Browse Source
This commit is contained in:
Thomas Tuegel 2015-05-12 17:07:34 -05:00
parent 24d5eb262d
commit d90aeb7629
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/kde-apps-15.04/default.nix
View File

@ -36,6 +36,7 @@ let
"Kipi" = "libkipi"; "Kipi" = "libkipi";
"LibKMahjongg" = "libkmahjongg"; "LibKMahjongg" = "libkmahjongg";
"LibKonq" = "kde-baseapps"; "LibKonq" = "kde-baseapps";
"Marble" = "marble";
}; };
mkDerivation = drv: kf5.mkDerivation (drv // { mkDerivation = drv: kf5.mkDerivation (drv // {
@ -336,6 +337,14 @@ let
buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv]; 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 // { libkipi = with pkgs; super.libkipi // {
buildInputs = super.libkipi.buildInputs ++ [scope.KDE4]; buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
}; };
@ -344,13 +353,6 @@ let
buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends]; 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 // { rocs = super.rocs // {
buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]); buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]);
}; };