diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/by-name/so/soqt/package.nix similarity index 70% rename from pkgs/development/libraries/soqt/default.nix rename to pkgs/by-name/so/soqt/package.nix index fd77508db80b..6f9ff22fb1b9 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/by-name/so/soqt/package.nix @@ -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 = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58d4be23fc88..c149634fde82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 6fbf6cfd6db0..c70f900e794b 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -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 { };