diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch index 08214c30a887..832e27cc9528 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch +++ b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch @@ -11,20 +11,20 @@ diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp index 4c40d4c..5dbb6ff 100644 --- a/cprime/systemxdg.cpp +++ b/cprime/systemxdg.cpp -@@ -372,9 +372,10 @@ void SystemXdgMime::setApplicationAsDefault(QString appFileName, QString mimetyp - +@@ -343,9 +343,10 @@ + SystemXdgMime::SystemXdgMime() { -- appsDirs << QDir::home().filePath(".local/share/applications/"); -- appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/"); -- appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/"); -+ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); -+ appsDirs << "/run/current-system/sw/share/applications/"; -+ appsDirs << "/run/current-system/sw/share/applications/kde4/"; -+ appsDirs << "/run/current-system/sw/share/gnome/applications/"; +- appsDirs << QDir::home().filePath(".local/share/applications/"); +- appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/"); +- appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/"); ++ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); ++ appsDirs << "/run/current-system/sw/share/applications/"; ++ appsDirs << "/run/current-system/sw/share/applications/kde4/"; ++ appsDirs << "/run/current-system/sw/share/gnome/applications/"; } - - + + -- 2.39.0 diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix index 353128b091af..f190c303eae2 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -1,23 +1,22 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, libnotify, cmake, ninja, - qtbase, - qtconnectivity, + qt6, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcprime"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore"; - repo = pname; - rev = "v${version}"; - hash = "sha256-j6WFLcjDMkYl+9HCmhMRttwtjNX05oP5mfdOsoLC7og="; + repo = "libcprime"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3tAbF4CoZJf92Z2/M/Cq7ruPew34Hl5Ojks7fI6kPbU="; }; patches = [ @@ -30,16 +29,18 @@ mkDerivation rec { ]; buildInputs = [ - qtbase - qtconnectivity + qt6.qtbase + qt6.qtconnectivity libnotify ]; - meta = with lib; { + dontWrapQtApps = true; + + meta = { description = "Library for bookmarking, saving recent activites, managing settings of C-Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/libcprime"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + homepage = "https://gitlab.com/cubocore/libcprime"; + 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 b7cd723e245b..d237d7b91be0 100644 --- a/pkgs/top-level/cubocore-packages.nix +++ b/pkgs/top-level/cubocore-packages.nix @@ -10,7 +10,7 @@ let self: with self; { # Libs - libcprime = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcprime { }; + libcprime = callPackage ../applications/misc/cubocore-packages/libcprime { }; libcsys = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcsys { };