From 0a87aeddc98a8e839228e58ad163d14ca79495cb Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:02:03 +0200 Subject: [PATCH] kemai: move to by-name --- .../ke/kemai/package.nix} | 21 +++++++------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 16 deletions(-) rename pkgs/{applications/misc/kemai/default.nix => by-name/ke/kemai/package.nix} (84%) diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/by-name/ke/kemai/package.nix similarity index 84% rename from pkgs/applications/misc/kemai/default.nix rename to pkgs/by-name/ke/kemai/package.nix index 7f3374ac0860..895f16fe3afa 100644 --- a/pkgs/applications/misc/kemai/default.nix +++ b/pkgs/by-name/ke/kemai/package.nix @@ -6,19 +6,12 @@ # buildInputs libxscrnsaver, magic-enum, - - # nativeBuildInputs - qtbase, - qtconnectivity, - qtlanguageserver, - qttools, + qt6, range-v3, spdlog, - qtwayland, # nativeBuildInputs cmake, - wrapQtAppsHook, # passthru nix-update-script, @@ -47,14 +40,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxscrnsaver magic-enum - qtbase - qtconnectivity - qtlanguageserver - qttools + qt6.qtbase + qt6.qtconnectivity + qt6.qtlanguageserver + qt6.qttools range-v3 spdlog ] - ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland; cmakeFlags = [ (lib.cmakeBool "KEMAI_ENABLE_UPDATE_CHECK" false) @@ -63,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; passthru = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97b383917ba1..61aaa93e7bbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9975,8 +9975,6 @@ with pkgs; gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; - kemai = qt6Packages.callPackage ../applications/misc/kemai { }; - jetbrains = ( recurseIntoAttrs ( callPackages ../applications/editors/jetbrains {