diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/kde-plasma.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/kde-systemtools.scm | 69 | ||||
| -rw-r--r-- | gnu/packages/kde.scm | 71 |
3 files changed, 77 insertions, 68 deletions
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 35bcb6b6a89..3fb3985bd09 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -1836,7 +1836,6 @@ on top of Baloo.") kiconthemes ;required by sddm breeze theme kinfocenter kmenuedit - kpmcore krdp kscreen kscreenlocker @@ -1889,6 +1888,10 @@ on top of Baloo.") (module-ref (resolve-interface '(gnu packages kde-systemtools)) + 'kpmcore) + (module-ref + (resolve-interface + '(gnu packages kde-systemtools)) 'kwalletmanager) spectacle)) ;; plasma-thunderbolt ;waiting for bolt diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 5c9af7e5f30..07a257547b2 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -21,6 +21,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages kde-systemtools) + #:use-module (guix build-system cmake) #:use-module (guix build-system qt) #:use-module (guix download) #:use-module (guix git-download) @@ -29,8 +30,11 @@ #:use-module (guix utils) #:use-module (guix gexp) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages aidc) + #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages cryptsetup) #:use-module (gnu packages freedesktop) #:use-module (gnu packages image) #:use-module (gnu packages kde) @@ -39,6 +43,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages ocr) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages polkit) #:use-module (gnu packages qt) #:use-module (gnu packages glib) #:use-module (gnu packages ruby) @@ -188,6 +193,70 @@ also described by a meta data file which contains the same information as a document meta data file.") (license license:gpl2+))) +(define-public kpmcore + (package + (name "kpmcore") + (version "24.12.3") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/release-service/" version + "/src/" name "-" version ".tar.xz")) + (sha256 + (base32 + "19xfaqj7i8mi5iwkh8n5d5h3m15bny0mzg2skpgbjdlmzc773iga")))) + (build-system cmake-build-system) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + `(("coreutils" ,coreutils) + ("cryptsetup" ,cryptsetup) + ("eudev" ,eudev) + ("kauth" ,kauth) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kwidgetsaddons" ,kwidgetsaddons) + ("lvm2" ,lvm2) + ("mdadm" ,mdadm) + ("polkit-qt6" ,polkit-qt6) + ("qtbase" ,qtbase) + ("qca-qt6" ,qca-qt6) + ("smartmontools" ,smartmontools) + ("util-linux" ,util-linux) + ("util-linux:lib" ,util-linux "lib"))) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-polkit-action-path + (lambda _ + (substitute* "src/util/CMakeLists.txt" + (("DESTINATION \\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") + "DESTINATION share/polkit-1/actions")) + (substitute* "src/backend/corebackend.cpp" + (("\\/usr") #$output)))) + (add-before 'configure 'patch-trustedprefixes-file + (lambda* (#:key inputs #:allow-other-keys) + (call-with-output-file "src/util/trustedprefixes" + (lambda (port) + (map (lambda (prefix) + (display prefix port) + (newline port)) + (list (assoc-ref inputs "coreutils") + (assoc-ref inputs "util-linux") + (assoc-ref inputs "eudev") + (assoc-ref inputs "cryptsetup") + (assoc-ref inputs "lvm2") + (assoc-ref inputs "mdadm") + (assoc-ref inputs "smartmontools") + "/run/current-system/profile" + "/usr" + "/"))))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Library for managing partitions") + (description "Library for managing partitions.") + (license license:gpl3+))) + (define-public konsole (package (name "konsole") diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 9f2ee65825a..27922b4c524 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -47,7 +47,6 @@ #:use-module (guix utils) #:use-module (guix packages) #:use-module (gnu packages) - #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages apr) #:use-module (gnu packages astronomy) @@ -61,7 +60,6 @@ #:use-module (gnu packages code) #:use-module (gnu packages cpp) #:use-module (gnu packages compression) - #:use-module (gnu packages cryptsetup) #:use-module (gnu packages curl) #:use-module (gnu packages djvu) #:use-module (gnu packages documentation) @@ -1393,70 +1391,6 @@ opening hours expressions.") multi-floor indoor maps.") (license license:lgpl2.0+))) -(define-public kpmcore - (package - (name "kpmcore") - (version "24.12.3") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/release-service/" version - "/src/" name "-" version ".tar.xz")) - (sha256 - (base32 - "19xfaqj7i8mi5iwkh8n5d5h3m15bny0mzg2skpgbjdlmzc773iga")))) - (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules pkg-config)) - (inputs - `(("coreutils" ,coreutils) - ("cryptsetup" ,cryptsetup) - ("eudev" ,eudev) - ("kauth" ,kauth) - ("kcoreaddons" ,kcoreaddons) - ("ki18n" ,ki18n) - ("kwidgetsaddons" ,kwidgetsaddons) - ("lvm2" ,lvm2) - ("mdadm" ,mdadm) - ("polkit-qt6" ,polkit-qt6) - ("qtbase" ,qtbase) - ("qca-qt6" ,qca-qt6) - ("smartmontools" ,smartmontools) - ("util-linux" ,util-linux) - ("util-linux:lib" ,util-linux "lib"))) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-polkit-action-path - (lambda _ - (substitute* "src/util/CMakeLists.txt" - (("DESTINATION \\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") - "DESTINATION share/polkit-1/actions")) - (substitute* "src/backend/corebackend.cpp" - (("\\/usr") #$output)))) - (add-before 'configure 'patch-trustedprefixes-file - (lambda* (#:key inputs #:allow-other-keys) - (call-with-output-file "src/util/trustedprefixes" - (lambda (port) - (map (lambda (prefix) - (display prefix port) - (newline port)) - (list (assoc-ref inputs "coreutils") - (assoc-ref inputs "util-linux") - (assoc-ref inputs "eudev") - (assoc-ref inputs "cryptsetup") - (assoc-ref inputs "lvm2") - (assoc-ref inputs "mdadm") - (assoc-ref inputs "smartmontools") - "/run/current-system/profile" - "/usr" - "/"))))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Library for managing partitions") - (description "Library for managing partitions.") - (license license:gpl3+))) - (define-public partitionmanager (package (name "partitionmanager") @@ -1483,7 +1417,10 @@ multi-floor indoor maps.") ki18n kio kjobwidgets - kpmcore + (module-ref + (resolve-interface + '(gnu packages kde-systemtools)) + 'kpmcore) kwidgetsaddons kwindowsystem kxmlgui |