From 08057f1c6db1890f02d2d4152a95e159bf6b60bf Mon Sep 17 00:00:00 2001 From: mourogurt Date: Thu, 9 Oct 2025 18:21:35 +0300 Subject: [PATCH 1/3] qtcreator: added function to compose package with plug-ins --- pkgs/development/tools/qtcreator/default.nix | 5 ++++ .../tools/qtcreator/with-plugins.nix | 23 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/qtcreator/with-plugins.nix diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 603c69a4fc9f..cabba61c97cc 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -27,6 +27,7 @@ rustc-demangle, elfutils, perf, + callPackage, }: stdenv.mkDerivation (finalAttrs: { @@ -104,6 +105,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace ''${!outputDev}/lib/cmake/QtCreator/QtCreatorConfig.cmake --replace "$out/" "" ''; + passthru = { + withPackages = callPackage ./with-plugins.nix { }; + }; + meta = { description = "Cross-platform IDE tailored to the needs of Qt developers"; longDescription = '' diff --git a/pkgs/development/tools/qtcreator/with-plugins.nix b/pkgs/development/tools/qtcreator/with-plugins.nix new file mode 100644 index 000000000000..6aa7b5f7d76b --- /dev/null +++ b/pkgs/development/tools/qtcreator/with-plugins.nix @@ -0,0 +1,23 @@ +{ + pkgs, + lib, + qtcreator, + ... +}: +f: +let + plugins_arg = builtins.foldl' ( + acc: val: acc + "-pluginpath ${val.outPath}/lib/qtcreator/plugins/" + ) "" f; + qtcreator_runner = pkgs.writeShellScriptBin "qtcreator" '' + exec ${lib.getExe qtcreator} ${plugins_arg} "$@" + ''; +in +pkgs.symlinkJoin { + inherit (qtcreator) version meta; + name = "qtcreator-with-plugins"; + paths = [ + qtcreator_runner + qtcreator + ]; +} From 8707b9b87df55d59dc56a429ea10effb7a426efe Mon Sep 17 00:00:00 2001 From: mourogurt Date: Sun, 19 Oct 2025 19:18:31 +0300 Subject: [PATCH 2/3] qodeassist-plugin: add passthru test --- .../libraries/qodeassist-plugin/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/qodeassist-plugin/default.nix b/pkgs/development/libraries/qodeassist-plugin/default.nix index edd9bf28dae0..07cad76954ed 100644 --- a/pkgs/development/libraries/qodeassist-plugin/default.nix +++ b/pkgs/development/libraries/qodeassist-plugin/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + runCommand, cmake, pkg-config, qttools, @@ -50,6 +51,15 @@ stdenv.mkDerivation (finalAttrs: { installPhase = "mkdir -p $out; cp -R lib $out/"; + passthru.tests = { + test-version = runCommand "${finalAttrs.pname}-test" { } '' + QT_QPA_PLATFORM="offscreen" ${ + lib.getExe (qtcreator.withPackages [ finalAttrs.finalPackage ]) + } --version > $out + cat $out | grep 'qodeassist ${finalAttrs.version}' + ''; + }; + meta = { description = "AI-powered coding assistant plugin for Qt Creator"; longDescription = '' From 958ff5d36ebdd7c2a2f2db3e69b3c81ddf9f5330 Mon Sep 17 00:00:00 2001 From: mourogurt Date: Sun, 19 Oct 2025 20:25:30 +0300 Subject: [PATCH 3/3] qt6Packages.qodeassist-plugin: specify same platforms whitch are supported by the QtC --- pkgs/development/libraries/qodeassist-plugin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qodeassist-plugin/default.nix b/pkgs/development/libraries/qodeassist-plugin/default.nix index 07cad76954ed..489716c2dcc9 100644 --- a/pkgs/development/libraries/qodeassist-plugin/default.nix +++ b/pkgs/development/libraries/qodeassist-plugin/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Palm1r/QodeAssist"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.zatm8 ]; - platforms = lib.platforms.linux; + platforms = qtcreator.meta.platforms; }; })