From 294a225c25a1210143d4d6181b45df1c6589e7bd Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:10:36 +0200 Subject: [PATCH] xca: move to by-name --- .../xca/default.nix => by-name/xc/xca/package.nix} | 14 ++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 6 insertions(+), 10 deletions(-) rename pkgs/{applications/misc/xca/default.nix => by-name/xc/xca/package.nix} (86%) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/by-name/xc/xca/package.nix similarity index 86% rename from pkgs/applications/misc/xca/default.nix rename to pkgs/by-name/xc/xca/package.nix index 5c01961ab18b..1a80b02a34fd 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/by-name/xc/xca/package.nix @@ -2,12 +2,10 @@ stdenv, lib, fetchFromGitHub, - wrapQtAppsHook, cmake, pkg-config, openssl, - qtbase, - qttools, + qt6, sphinx, }: @@ -24,19 +22,19 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl - qtbase + qt6.qtbase ]; nativeBuildInputs = [ cmake pkg-config - qttools + qt6.qttools sphinx - wrapQtAppsHook + qt6.wrapQtAppsHook ]; # Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710) - QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; + QT_PLUGIN_PATH = "${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}"; enableParallelBuilding = true; @@ -56,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { offline peterhoeg ]; - inherit (qtbase.meta) platforms; + inherit (qt6.qtbase.meta) platforms; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2ba126c9ce6..c6c4e1832711 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11420,8 +11420,6 @@ with pkgs; gbmSupport = true; }; - xca = qt6Packages.callPackage ../applications/misc/xca { }; - xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { }; xdg-desktop-portal-hyprland =