diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-11-27 11:25:21 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-11-27 11:48:16 +0100 |
| commit | 71e47839ba82213c667cc8f14969192d85ee4372 (patch) | |
| tree | 9a6615725ed16ecf64063f447f391ab38bd3789d | |
| parent | c108602c3361933f734173dff9d325cee5137835 (diff) | |
| download | guix-71e47839ba82213c667cc8f14969192d85ee4372.tar.gz guix-71e47839ba82213c667cc8f14969192d85ee4372.zip | |
gnu: k3b: Remove references to '%outputs' and '%build-inputs'.
* gnu/packages/kde-multimedia.scm (k3b)[arguments]: Remove references to
'%build-inputs' and '%outputs'.
| -rw-r--r-- | gnu/packages/kde-multimedia.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 04857188fc..84cdca94ad 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -308,11 +308,11 @@ This package is part of the KDE multimedia module.") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'set-absolute-library-paths - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) ;; Set absolute paths for dlopened libraries. We can’t use k3b’s ;; runpath as they are loaded by the Qt library. - (let ((libcdio-paranoia (assoc-ref %build-inputs "libcdio-paranoia")) - (libdvdcss (assoc-ref %build-inputs "libdvdcss"))) + (let ((libcdio-paranoia (assoc-ref inputs "libcdio-paranoia")) + (libdvdcss (assoc-ref inputs "libdvdcss"))) (substitute* "libk3b/tools/k3bcdparanoialib.cpp" (("\"(cdio_cdda|cdio_paranoia)\"" _ library) (string-append "\"" libcdio-paranoia "/lib/" library "\""))) @@ -321,12 +321,12 @@ This package is part of the KDE multimedia module.") (string-append "\"" libdvdcss "/lib/" library "\"")))) #t)) (add-after 'qt-wrap 'wrap-path - (lambda _ + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Set paths to backend programs. - (wrap-program (string-append (assoc-ref %outputs "out") "/bin/k3b") + (wrap-program (string-append (assoc-ref outputs "out") "/bin/k3b") `("PATH" ":" prefix ,(map (lambda (input) - (string-append (assoc-ref %build-inputs input) "/bin")) + (string-append (assoc-ref inputs input) "/bin")) '("cdrdao" "dvd+rw-tools" "libburn" "sox")))) #t))))) (native-inputs |