diff options
Diffstat (limited to 'gnu/packages/kde-multimedia.scm')
-rw-r--r-- | gnu/packages/kde-multimedia.scm | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 21ca996246..84cdca94ad 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -24,6 +24,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages audio) #:use-module (gnu packages base) @@ -186,8 +187,7 @@ This package is part of the KDE multimedia module.") (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server, setting ;; QT_QPA_PLATFORM=offscreen does not suffice. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) + (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") #t)) (replace 'check @@ -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 @@ -475,11 +475,11 @@ autoloading of subtitle files for use while playing video.") ("qtquickcontrols2" ,qtquickcontrols2) ; not listed as dependency ("qtx11extras" ,qtx11extras))) (arguments - `(#:tests? #f ; test program gets built, but is not found - #:configure-flags - (list (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs "gst-plugins-base") - "/include/gstreamer-1.0")))) + (list #:tests? #f ; test program gets built, but is not found + #:configure-flags + #~(list (string-append "-DCMAKE_CXX_FLAGS=-I" + #$(this-package-input "gst-plugins-base") + "/include/gstreamer-1.0")))) (home-page "https://kde.org/applications/multimedia/org.kde.kamoso") (synopsis "Take pictures and videos out of your webcam") (description "Kamoso is a simple and friendly program to use your @@ -577,10 +577,11 @@ This package is part of the KDE multimedia module.") ("xcb-util-keysyms" ,xcb-util-keysyms) ("xcb-util-wm" ,xcb-util-wm))) (arguments - `(#:configure-flags - (list (string-append - "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs "qtx11extras") "/include/qt5")))) + (list #:configure-flags + #~(list (string-append + "-DCMAKE_CXX_FLAGS=-I" + #$(this-package-input "qtx11extras") + "/include/qt5")))) (home-page "https://kde.org/applications/multimedia/org.kde.kmplayer") (synopsis "Media player using mplayer/phonon as backend") (description "Kmplayer can play all the audio/video supported by |