soqt: migrate to qt6 and pkgs/by-name

This commit is contained in:
qbisi
2025-09-30 15:52:26 +08:00
parent 2060d3945c
commit dc44762f4c
3 changed files with 12 additions and 13 deletions
@@ -4,9 +4,9 @@
fetchFromGitHub,
cmake,
coin3d,
qtbase,
qt6,
testers,
wrapQtAppsHook,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -27,17 +27,20 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [
coin3d
qtbase
qt6.qtbase
];
dontWrapQtApps = true;
passthru.tests = {
cmake-config = testers.hasCmakeConfigModules {
moduleNames = [ "soqt" ];
package = finalAttrs.finalPackage;
nativeBuildInputs = [ wrapQtAppsHook ];
passthru = {
tests = {
cmake-config = testers.hasCmakeConfigModules {
moduleNames = [ "soqt" ];
package = finalAttrs.finalPackage;
nativeBuildInputs = [ qt6.wrapQtAppsHook ];
};
};
updateScript = nix-update-script { };
};
meta = {
+1 -3
View File
@@ -11848,9 +11848,7 @@ self: super: with self; {
piqp = callPackage ../development/python-modules/piqp { };
pivy = callPackage ../development/python-modules/pivy {
inherit (pkgs.libsForQt5) soqt;
};
pivy = callPackage ../development/python-modules/pivy { };
pixcat = callPackage ../development/python-modules/pixcat { };
-2
View File
@@ -215,8 +215,6 @@ makeScopeWithSplicing' {
callPackage ../development/libraries/sailfish-access-control-plugin
{ };
soqt = callPackage ../development/libraries/soqt { };
telepathy = callPackage ../development/libraries/telepathy/qt { };
qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };