From a685f98627e624c04d7b5db17447b9d4434a68a1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 17 Dec 2015 05:36:51 -0600 Subject: [PATCH] calamares: move into kde5PackagesFun All KDE 5 packages must be listed here to be packaged correctly. --- pkgs/top-level/all-packages.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 352ebda277d..f5a5f12099f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {};