mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 17:39:34 +00:00
kdeApps_15_04.libkgeomap: fix missing marble dependency
This commit is contained in:
parent
24d5eb262d
commit
d90aeb7629
|
@ -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 ]);
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue