diff options
| author | Petr Hodina <phodina@protonmail.com> | 2022-09-27 08:39:15 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-11-21 22:01:08 +0100 |
| commit | 2f68492d10940bd88e1bd662188d21ce76178676 (patch) | |
| tree | 8204130f68de90b7491935a6e17f7ae6f25ea974 /gnu/packages/kde-frameworks.scm | |
| parent | 5922ceabde5098912a718e835f4549659bbc12b4 (diff) | |
| download | guix-2f68492d10940bd88e1bd662188d21ce76178676.tar guix-2f68492d10940bd88e1bd662188d21ce76178676.tar.gz | |
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>
Diffstat (limited to 'gnu/packages/kde-frameworks.scm')
| -rw-r--r-- | gnu/packages/kde-frameworks.scm | 11 |
1 files 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 |