[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
47/143: gnu: kdbusaddons: Use gexp.
From: |
guix-commits |
Subject: |
47/143: gnu: kdbusaddons: Use gexp. |
Date: |
Mon, 21 Nov 2022 16:10:44 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 2f68492d10940bd88e1bd662188d21ce76178676
Author: Petr Hodina <phodina@protonmail.com>
AuthorDate: Tue Sep 27 08:39:15 2022 +0200
gnu: kdbusaddons: Use gexp.
* gnu/packages/kde-frameworks.scm (kdbusadons, kdbusaddons-bootstrap): Use
gexp.
(kdbusaddons-bootstrap) [inputs]: Use modify-inputs.
Signed-off-by: Marius Bakke <marius@gnu.org>
---
gnu/packages/kde-frameworks.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index f1aae61a3c..dd6d1b303a 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -680,8 +680,8 @@ many more.")
(list qtbase-5 qtx11extras kinit-bootstrap))
;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
(arguments
- `(#:phases
- (modify-phases %standard-phases
+ (list #:phases
+ #~(modify-phases %standard-phases
(add-before 'configure 'patch-source
(lambda* (#:key inputs #:allow-other-keys)
;; look for the kdeinit5 executable in kinit's store directory,
@@ -689,7 +689,8 @@ many more.")
(substitute* "src/kdeinitinterface.cpp"
(("<< QCoreApplication::applicationDirPath..")
(string-append
- "<< QString::fromUtf8(\"" (assoc-ref inputs "kinit") "/bin\")"
)))))
+ "<< QString::fromUtf8(\"/" (dirname (search-input-file inputs
+ "bin/kdeinit5")) "\")" )))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
@@ -3437,11 +3438,11 @@ need.")
(source (origin
(inherit (package-source kdbusaddons))
(patches '())))
- (inputs (alist-delete "kinit" (package-inputs kdbusaddons)))
+ (inputs (modify-inputs (package-inputs kdbusaddons) (delete "kinit")))
(arguments
(substitute-keyword-arguments (package-arguments kdbusaddons)
((#:phases phases)
- `(modify-phases ,phases
+ #~(modify-phases #$phases
(delete 'patch-source)))))))
(define kinit-bootstrap
- 27/143: gnu: QT: Remove trailing booleans., (continued)
- 27/143: gnu: QT: Remove trailing booleans., guix-commits, 2022/11/21
- 30/143: gnu: KDE: Update to 22.08.1., guix-commits, 2022/11/21
- 04/143: gnu: kcontacts: Run all but 3 tests., guix-commits, 2022/11/21
- 05/143: gnu: krunner: Enable all tests., guix-commits, 2022/11/21
- 10/143: gnu: ktexteditor: Add more inputs., guix-commits, 2022/11/21
- 25/143: gnu: grantleetheme: Update to 22.08.1., guix-commits, 2022/11/21
- 32/143: gnu: Add libaccounts-glib., guix-commits, 2022/11/21
- 20/143: gnu: libksysguard: Enable all tests., guix-commits, 2022/11/21
- 24/143: gnu: kinit: Use gexp., guix-commits, 2022/11/21
- 34/143: gnu: Add signon-plugin-oauth2., guix-commits, 2022/11/21
- 47/143: gnu: kdbusaddons: Use gexp.,
guix-commits <=
- 48/143: gnu: Add kwayland-integration., guix-commits, 2022/11/21
- 54/143: gnu: Add kscreen., guix-commits, 2022/11/21
- 55/143: gnu: Add kwrited., guix-commits, 2022/11/21
- 64/143: gnu: Add latte-dock., guix-commits, 2022/11/21
- 80/143: gnu: Add discover., guix-commits, 2022/11/21
- 81/143: gnu: discover: Don't use patchelf., guix-commits, 2022/11/21
- 82/143: gnu: Add ksystemstats., guix-commits, 2022/11/21
- 86/143: gnu: Add polkit-kde-agent., guix-commits, 2022/11/21
- 03/143: gnu: kio: Enable 2 tests., guix-commits, 2022/11/21
- 14/143: gnu: plasma-framework: Remove 'apply-fix' phase., guix-commits, 2022/11/21