From c02371480f991b1f7e18bf71f6aedccadcd153f2 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 20 Apr 2025 11:28:03 +0800 Subject: [PATCH] CuboCore.corestuff: 4.5.0 -> 5.0.0 Diff: https://gitlab.com/cubocore/coreapps/corestuff/-/compare/v4.5.0...v5.0.0 --- .../corestuff/0001-fix-installPhase.patch | 12 +++---- .../cubocore-packages/corestuff/default.nix | 34 +++++++++---------- pkgs/top-level/cubocore-packages.nix | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch b/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch index d1db6a0a0a2e..5c8f9557d17a 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch +++ b/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch @@ -1,11 +1,11 @@ --- a/corestuff/CMakeLists.txt 2022-01-29 14:09:02.699700817 +0700 +++ b/CMakeLists.txt 2022-01-29 14:09:23.211754633 +0700 -@@ -120,8 +120,3 @@ - install( FILES org.cubocore.CoreStuff.desktop DESTINATION share/applications ) - install( FILES org.cubocore.CoreStuff.svg DESTINATION share/icons/hicolor/scalable/apps/ ) +@@ -121,7 +121,3 @@ + install( FILES cc.cubocore.CoreStuff.svg DESTINATION share/icons/hicolor/scalable/apps/ ) install( FILES background/default.svg DESTINATION share/coreapps/background ) -- + -if ( DEFINED ADD_AUTOSTART ) -- message("INSTALLING TO AUTOSTART LOCATION") -- install( FILES org.cubocore.CoreStuff.desktop DESTINATION /etc/xdg/autostart ) +- message("INSTALLING TO AUTOSTART LOCATION") +- install( FILES cc.cubocore.CoreStuff.desktop DESTINATION /etc/xdg/autostart ) -endif() + diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index 8ec6080a4c32..55089f533438 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -1,10 +1,8 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, - qtx11extras, - kglobalaccel, + kdePackages, xorg, cmake, ninja, @@ -12,15 +10,15 @@ libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corestuff"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-2tnJMBbROGWZQDWjy/xGBNkv7DXXKLWrHf2XnMjOjWQ="; + repo = "corestuff"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/EI7oM7c7GKEQ+XQSiWwkJ7uNrJkxgLXEXZ6r5Jqh70="; }; patches = [ @@ -31,23 +29,25 @@ mkDerivation rec { nativeBuildInputs = [ cmake ninja + kdePackages.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtx11extras - kglobalaccel + kdePackages.qtbase + kdePackages.kglobalaccel xorg.libXcomposite libcprime libcsys ]; - meta = with lib; { + meta = { description = "Activity viewer from the C Suite"; mainProgram = "corestuff"; homepage = "https://gitlab.com/cubocore/coreapps/corestuff"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; + # Address boundary error + broken = true; }; -} +}) diff --git a/pkgs/top-level/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix index 0217de239e95..e3d6af798ecb 100644 --- a/pkgs/top-level/cubocore-packages.nix +++ b/pkgs/top-level/cubocore-packages.nix @@ -75,7 +75,7 @@ let inherit libcprime libcsys; }; - corestuff = libsForQt5.callPackage ../applications/misc/cubocore-packages/corestuff { + corestuff = callPackage ../applications/misc/cubocore-packages/corestuff { inherit libcprime libcsys; };