From f5a95125c2f486b2abd643610b3b0fbb5aa3564a Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 20 Apr 2025 11:40:26 +0800 Subject: [PATCH] CuboCore.coretoppings: 4.5.0 -> 5.0.0 Diff: https://gitlab.com/cubocore/coreapps/coretoppings/-/compare/v4.5.0...v5.0.0 --- .../coretoppings/0001-fix-install-phase.patch | 10 +++--- .../coretoppings/default.nix | 32 +++++++++---------- pkgs/top-level/cubocore-packages.nix | 2 +- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch index 3c0c942ee43a..377d0ed90d7f 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch @@ -1,8 +1,8 @@ --- a/corepkit/CMakeLists.txt 2021-12-25 17:52:20.000000000 +0700 +++ b/corepkit/CMakeLists.txt 2021-12-29 17:58:09.298024297 +0700 -@@ -32,4 +32,4 @@ - target_link_libraries( corepkit Qt5::Core ) - +@@ -31,4 +31,4 @@ + target_link_libraries( corepkit Qt6::Core ) + install( TARGETS corepkit DESTINATION libexec/coreapps/ ) --install( FILES org.cubocore.coreapps.policy DESTINATION share/polkit-1/actions/ ) -+install( FILES org.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ ) +-install( FILES cc.cubocore.coreapps.policy DESTINATION share/polkit-1/actions/ ) ++install( FILES cc.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ ) diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index ed5d5fc49fa9..70cb09b4dca3 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -1,13 +1,11 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, + qt6, ffmpeg, cmake, ninja, - qtbase, - qtx11extras, - qtconnectivity, v4l-utils, grim, wf-recorder, @@ -29,15 +27,15 @@ libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coretoppings"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-IYUkPGgFGI6889IyromMBobIoqSZtALVsSswQ7O1Bp0="; + repo = "coretoppings"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wHVdZqXn8DXqLbCdKz2fI8BjNVai5dRq3a45HVCvLa8="; }; patches = [ @@ -48,12 +46,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtx11extras - qtconnectivity + qt6.qtbase + qt6.qtconnectivity libdbusmenu ffmpeg v4l-utils @@ -78,12 +76,12 @@ mkDerivation rec { libcsys ]; - meta = with lib; { + meta = { description = "Additional features,plugins etc for CuboCore Application Suite"; mainProgram = "shareIT"; homepage = "https://gitlab.com/cubocore/coreapps/coretoppings"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix index 08636f91a604..673ffe022a89 100644 --- a/pkgs/top-level/cubocore-packages.nix +++ b/pkgs/top-level/cubocore-packages.nix @@ -88,7 +88,7 @@ let inherit libcprime libcsys; }; - coretoppings = libsForQt5.callPackage ../applications/misc/cubocore-packages/coretoppings { + coretoppings = callPackage ../applications/misc/cubocore-packages/coretoppings { inherit libcprime libcsys; };