me
/
guix
Archived
1
0
Fork 0
Code

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>
Petr Hodina 2022-09-27 08:39:15 +02:00 committed by Marius Bakke
parent 5922ceabde
commit 2f68492d10
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/kde-frameworks.scm
View File

@ -680,8 +680,8 @@ many more.")
(list qtbase-5 qtx11extras kinit-bootstrap)) (list qtbase-5 qtx11extras kinit-bootstrap))
;; kinit-bootstrap: kinit package which does not depend on kdbusaddons. ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
(arguments (arguments
`(#:phases (list #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'configure 'patch-source (add-before 'configure 'patch-source
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; look for the kdeinit5 executable in kinit's store directory, ;; look for the kdeinit5 executable in kinit's store directory,
@ -689,7 +689,8 @@ many more.")
(substitute* "src/kdeinitinterface.cpp" (substitute* "src/kdeinitinterface.cpp"
(("<< QCoreApplication::applicationDirPath..") (("<< QCoreApplication::applicationDirPath..")
(string-append (string-append
"<< QString::fromUtf8(\"" (assoc-ref inputs "kinit") "/bin\")" ))))) "<< QString::fromUtf8(\"/" (dirname (search-input-file inputs
"bin/kdeinit5")) "\")" )))))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
@ -3437,11 +3438,11 @@ need.")
(source (origin (source (origin
(inherit (package-source kdbusaddons)) (inherit (package-source kdbusaddons))
(patches '()))) (patches '())))
(inputs (alist-delete "kinit" (package-inputs kdbusaddons))) (inputs (modify-inputs (package-inputs kdbusaddons) (delete "kinit")))
(arguments (arguments
(substitute-keyword-arguments (package-arguments kdbusaddons) (substitute-keyword-arguments (package-arguments kdbusaddons)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(delete 'patch-source))))))) (delete 'patch-source)))))))
(define kinit-bootstrap (define kinit-bootstrap