[bug#60391] [PATCH 0/2] Update x42-plugins and use new package style.

[bug#60391] [PATCH 0/2] Update x42-plugins and use new package style.

[kiasoc5 via Guix-patches via]

kiasoc5 (2):
  gnu: x42-plugins: Update to 20221119.
  gnu: x42-plugins: Use new package style.

 gnu/packages/music.scm | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)


base-commit: 4ca649e978f08335fcabdcef693a7049082b5373
-- 
2.39.0

[bug#60391] [PATCH 1/2] gnu: x42-plugins: Update to 20221119.

[kiasoc5 via Guix-patches via]

* gnu/packages/music.scm (x42-plugins): Update to 20221119.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5be767a138..58419bc954 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5928,7 +5928,7 @@ (define-public spectacle-analyzer
 (define-public x42-plugins
   (package
     (name "x42-plugins")
-    (version "20211016")
+    (version "20221119")
     (source
      (origin
        (method url-fetch)
@@ -5936,7 +5936,7 @@ (define-public x42-plugins
         (string-append "https://gareus.org/misc/x42-plugins/x42-plugins-"
                        version ".tar.xz"))
        (sha256
-        (base32 "11bf6q42ihyk4qxwf83y0847zzyl65kwpbk3hmyz0f0ykil5fsb7"))))
+        (base32 "128h9x7yzhy6q6l0fqk2zd6l48wgs2lhf2pzbiba6h3n6l9n555b"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no "check" target
-- 
2.39.0

[bug#60391] [PATCH 2/2] gnu: x42-plugins: Use new package style.

[kiasoc5 via Guix-patches via]

* gnu/packages/music.scm (x42-plugins)[arguments]: Use g-expressions. Remove
references to %outputs and %build-inputs.
[inputs]: Add font-dejavu.
---
 gnu/packages/music.scm | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 58419bc954..4784e8ca2e 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5939,21 +5939,23 @@ (define-public x42-plugins
         (base32 "128h9x7yzhy6q6l0fqk2zd6l48wgs2lhf2pzbiba6h3n6l9n555b"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ; no "check" target
-       #:make-flags
-       (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
-             "LIBZITACONVOLVER=-lzita-convolver"
-             (string-append "FONTFILE="
-                            (assoc-ref %build-inputs "font-dejavu")
-                            "/share/fonts/truetype/DejaVuSans-Bold.ttf")
-             (string-append "CC=" ,(cc-for-target)))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))))
+     (list
+      #:tests? #f                      ; no "check" target
+      #:make-flags
+      #~(list (string-append "PREFIX=" #$output)
+              "LIBZITACONVOLVER=-lzita-convolver"
+              (string-append "FONTFILE="
+                             #$(this-package-input "font-dejavu")
+                             "/share/fonts/truetype/DejaVuSans-Bold.ttf")
+              (string-append "CC=" #$(cc-for-target)))
+      #:phases
+      #~(modify-phases %standard-phases
+        (delete 'configure))))
     (inputs
      (list cairo
            fftwf
            ftgl
+           font-dejavu
            glib
            glu
            hicolor-icon-theme
-- 
2.39.0

bug#60391: [PATCH 0/2] Update x42-plugins and use new package style.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 537 bytes --]


kiasoc5 via Guix-patches via <guix-patches@gnu.org> writes:

> kiasoc5 (2):
>   gnu: x42-plugins: Update to 20221119.
>   gnu: x42-plugins: Use new package style.
>
>  gnu/packages/music.scm | 28 +++++++++++++++-------------
>  1 file changed, 15 insertions(+), 13 deletions(-)

Thanks, I've pushed these to master as
8781ab4057692c854c91ac71c660a229ac2d8ae5.

In the second patch, I switched this-package-input to
this-package-native-input to avoid the need to have font-dejavu as both
an input and native-input.

Thanks again,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]