From 2f68492d10940bd88e1bd662188d21ce76178676 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 27 Sep 2022 08:39:15 +0200 Subject: 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 --- gnu/packages/kde-frameworks.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/kde-frameworks.scm') 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 @@ (define-public kdbusaddons (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 @@ (define-public kdbusaddons (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 @@ (define kdbusaddons-bootstrap (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 -- cgit v1.2.3