tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
kdeApps_15_04.libkgeomap: fix missing marble dependency
Thomas Tuegel
10 years ago
d90aeb76
24d5eb26
+9
-7
1 changed file
expand all
collapse all
unified
split
pkgs
applications
kde-apps-15.04
default.nix
+9
-7
pkgs/applications/kde-apps-15.04/default.nix
···
36
36
"Kipi" = "libkipi";
37
37
"LibKMahjongg" = "libkmahjongg";
38
38
"LibKonq" = "kde-baseapps";
39
39
+
"Marble" = "marble";
39
40
};
40
41
41
42
mkDerivation = drv: kf5.mkDerivation (drv // {
···
336
337
buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
337
338
};
338
339
340
340
+
libkgeomap = super.libkgeomap // {
341
341
+
cmakeFlags =
342
342
+
(super.libkgeomap.cmakeFlags or [])
343
343
+
++ [
344
344
+
"-DCMAKE_MODULE_PATH=${kdeApps.marble}/share/apps/cmake/modules"
345
345
+
];
346
346
+
};
347
347
+
339
348
libkipi = with pkgs; super.libkipi // {
340
349
buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
341
350
};
342
351
343
352
libksane = with pkgs; super.libksane // {
344
353
buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
345
345
-
};
346
346
-
347
347
-
marble = super.marble // {
348
348
-
preConfigure = ''
349
349
-
${super.preConfigure or ""}
350
350
-
cmakeFlags="$cmakeFlags -DCMAKE_MODULES_INSTALL_PATH=$out/lib/cmake"
351
351
-
'';
352
354
};
353
355
354
356
rocs = super.rocs // {