From 5f3c3d53eb711684ea3dad651689d506e61fb8e2 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 27 Sep 2022 23:14:34 +0200 Subject: [PATCH] gnu: kio: Add more inputs. * gnu/packages/kde-frameworks.scm (kio)[inputs]: Add kded and qtdeclarative-5. [propagated-inputs]: Add libacl. [arguments]: Enable 2 passing tests. Use gexp. Signed-off-by: Marius Bakke --- gnu/packages/kde-frameworks.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 5cdda92bc4..b4760bfa30 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2641,7 +2641,8 @@ (define-public kio (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs - (list kbookmarks + (list acl + kbookmarks kconfig kcompletion kcoreaddons @@ -2653,14 +2654,14 @@ (define-public kio solid)) (native-inputs (list extra-cmake-modules dbus kdoctools qttools-5)) - (inputs (list ;; TODO: LibACL , - mit-krb5 + (inputs (list mit-krb5 karchive kauth kcodecs kconfigwidgets kcrash kdbusaddons + kded kguiaddons kiconthemes ki18n @@ -2671,14 +2672,15 @@ (define-public kio libxml2 libxslt qtbase-5 + qtdeclarative-5 qtscript qtx11extras sonnet `(,util-linux "lib") ; libmount zlib)) (arguments - `(#:phases - (modify-phases %standard-phases + (list #:phases + #~(modify-phases %standard-phases (add-after 'unpack 'patch (lambda _ ;; Better error message (taken from NixOS) @@ -2693,10 +2695,10 @@ (define-public kio (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "ctest" - "-E" ; FIXME: 19/67 tests fail. + "-E" ; FIXME: 17/69 tests fail. (string-append "(kiocore-jobtest" - "|fileitemtest" "|kiocore-kmountpointtest" + "|kiocore-kfileitemtest" "|kiocore-ktcpsockettest" "|kiocore-mimetypefinderjobtest" "|kiocore-krecentdocumenttest" @@ -2708,18 +2710,15 @@ (define-public kio "|commandlauncherjob_forkingtest" "|commandlauncherjob_scopetest" "|commandlauncherjob_servicetest" - "|kiowidgets-kdirlistertest" "|kiowidgets-kdirmodeltest" "|kiowidgets-kurifiltertest-colon-separator" - "|kiowidgets-kurifiltertest-space-separator" - "|kiofilewidgets-knewfilemenutest)"))))) + "|kiowidgets-kurifiltertest-space-separator)"))))) (add-after 'install 'add-symlinks ;; Some package(s) (e.g. bluedevil) refer to these service types by ;; the wrong name. I would prefer to patch those packages, but I ;; cannot find the files! (lambda* (#:key outputs #:allow-other-keys) - (let ((kst5 (string-append (assoc-ref outputs "out") - "/share/kservicetypes5/"))) + (let ((kst5 (string-append #$output "/share/kservicetypes5/"))) (symlink (string-append kst5 "kfileitemactionplugin.desktop") (string-append kst5 "kfileitemaction-plugin.desktop")))))))) (home-page "https://community.kde.org/Frameworks")