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
"Kipi" = "libkipi";
37
"LibKMahjongg" = "libkmahjongg";
38
"LibKonq" = "kde-baseapps";
0
39
};
40
41
mkDerivation = drv: kf5.mkDerivation (drv // {
···
336
buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
337
};
338
0
0
0
0
0
0
0
0
339
libkipi = with pkgs; super.libkipi // {
340
buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
341
};
342
343
libksane = with pkgs; super.libksane // {
344
buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
345
-
};
346
-
347
-
marble = super.marble // {
348
-
preConfigure = ''
349
-
${super.preConfigure or ""}
350
-
cmakeFlags="$cmakeFlags -DCMAKE_MODULES_INSTALL_PATH=$out/lib/cmake"
351
-
'';
352
};
353
354
rocs = super.rocs // {
···
36
"Kipi" = "libkipi";
37
"LibKMahjongg" = "libkmahjongg";
38
"LibKonq" = "kde-baseapps";
39
+
"Marble" = "marble";
40
};
41
42
mkDerivation = drv: kf5.mkDerivation (drv // {
···
337
buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
338
};
339
340
+
libkgeomap = super.libkgeomap // {
341
+
cmakeFlags =
342
+
(super.libkgeomap.cmakeFlags or [])
343
+
++ [
344
+
"-DCMAKE_MODULE_PATH=${kdeApps.marble}/share/apps/cmake/modules"
345
+
];
346
+
};
347
+
348
libkipi = with pkgs; super.libkipi // {
349
buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
350
};
351
352
libksane = with pkgs; super.libksane // {
353
buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
0
0
0
0
0
0
0
354
};
355
356
rocs = super.rocs // {