guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

414/465: gnu: k3b: Use new style.


From: guix-commits
Subject: 414/465: gnu: k3b: Use new style.
Date: Wed, 17 Jul 2024 23:02:19 -0400 (EDT)

z572 pushed a commit to branch kde-team
in repository guix.

commit 8d787f253096343d970eda4fe6d03f8fb7d8d198
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Tue Jul 9 11:58:10 2024 +0800

    gnu: k3b: Use new style.
    
    * gnu/packages/kde-multimedia.scm (k3b): Use news style.
    [arguments]: Use Gexps; Remove tailed #t.
    
    Change-Id: I154d271ce2b0ba3722490db77d25fce2611b4ee8
---
 gnu/packages/kde-multimedia.scm | 67 ++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 33de6c50cd..09c7bc76af 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -367,40 +367,39 @@ variety of formats.")
         (base32 "11r6nda3djj9p918sx9bpipc1byg5mvgib4vyf0kpdpnh9bnhvcj"))))
     (build-system qt-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'set-absolute-library-paths
-           (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 inputs "libcdio-paranoia"))
-                   (libdvdcss (assoc-ref inputs "libdvdcss")))
-               (substitute* "libk3b/tools/k3bcdparanoialib.cpp"
-                 (("\"(cdio_cdda|cdio_paranoia)\"" _ library)
-                  (string-append "\"" libcdio-paranoia "/lib/" library "\"")))
-               (substitute* "libk3b/tools/k3blibdvdcss.cpp"
-                 (("\"(dvdcss)\"" _ library)
-                  (string-append "\"" libdvdcss "/lib/" library "\""))))
-             #t))
-         (add-before 'configure 'fix-cmake-taglib
-           (lambda _
-             ;; Use the CMake variables provided by FindTaglib from
-             ;; extra-cmake-modules, instead of bundled FindTaglib.cmake:
-             (substitute*
-                 '("plugins/decoder/mp3/CMakeLists.txt"
-                   "plugins/decoder/flac/CMakeLists.txt"
-                   "plugins/project/audiometainforenamer/CMakeLists.txt")
-               (("TAGLIB_INCLUDES") "Taglib_INCLUDE_DIRS")
-               (("TAGLIB_LIBRARIES") "Taglib_LIBRARIES"))))
-         (add-after 'qt-wrap 'wrap-path
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             ;; Set paths to backend programs.
-             (wrap-program (string-append (assoc-ref outputs "out") "/bin/k3b")
-               `("PATH" ":" prefix
-                 ,(map (lambda (input)
-                         (string-append (assoc-ref inputs input) "/bin"))
-                       '("cdrdao" "cdrtools" "dvd+rw-tools" "libburn" "sox"))))
-             #t)))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'set-absolute-library-paths
+            (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 inputs "libcdio-paranoia"))
+                    (libdvdcss (assoc-ref inputs "libdvdcss")))
+                (substitute* "libk3b/tools/k3bcdparanoialib.cpp"
+                  (("\"(cdio_cdda|cdio_paranoia)\"" _ library)
+                   (string-append "\"" libcdio-paranoia "/lib/" library "\"")))
+                (substitute* "libk3b/tools/k3blibdvdcss.cpp"
+                  (("\"(dvdcss)\"" _ library)
+                   (string-append "\"" libdvdcss "/lib/" library "\""))))))
+          (add-before 'configure 'fix-cmake-taglib
+            (lambda _
+              ;; Use the CMake variables provided by FindTaglib from
+              ;; extra-cmake-modules, instead of bundled FindTaglib.cmake:
+              (substitute*
+                  '("plugins/decoder/mp3/CMakeLists.txt"
+                    "plugins/decoder/flac/CMakeLists.txt"
+                    "plugins/project/audiometainforenamer/CMakeLists.txt")
+                (("TAGLIB_INCLUDES") "Taglib_INCLUDE_DIRS")
+                (("TAGLIB_LIBRARIES") "Taglib_LIBRARIES"))))
+          (add-after 'qt-wrap 'wrap-path
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              ;; Set paths to backend programs.
+              (wrap-program (string-append (assoc-ref outputs "out") 
"/bin/k3b")
+                `("PATH" ":" prefix
+                  ,(map (lambda (input)
+                          (string-append (assoc-ref inputs input) "/bin"))
+                        '("cdrdao" "cdrtools" "dvd+rw-tools" "libburn" 
"sox")))))))))
     (native-inputs
      (list extra-cmake-modules pkg-config kdoctools-5))
     (inputs



reply via email to

[Prev in Thread] Current Thread [Next in Thread]