calamares: move into kde5PackagesFun

All KDE 5 packages must be listed here to be packaged correctly.
This commit is contained in:
Thomas Tuegel 2015-12-17 05:36:51 -06:00
parent 89ecedcab8
commit a685f98627

View file

@ -1732,13 +1732,6 @@ let
ghostscript = null;
};
calamares = callPackage ../tools/misc/calamares rec {
python = python3;
boost = pkgs.boost.override { python=python3; };
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
inherit (kf5_stable) extra-cmake-modules kconfig ki18n kcoreaddons solid;
};
grub = callPackage_i686 ../tools/misc/grub {
buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
automake = automake112x; # fails with 13 and 14
@ -14718,6 +14711,12 @@ let
kde5PackagesFun = self: with self; {
calamares = callPackage ../tools/misc/calamares rec {
python = python3;
boost = pkgs.boost.override { python=python3; };
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
};
fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
k9copy = callPackage ../applications/video/k9copy {};