Subject: Re: [bug#43317] [PATCH] gnu: Add surge-synth.

From: Ludovic Courtès <[email-masked]>
Date: Sat, 19 Sep 2020 22:51:42 +0200

Hi Alex,

Alexandros Theodotou <[email-masked]> skribis:

> From 613f46926fdf0453ec5ad5f5883130ed86bf6d9c Mon Sep 17 00:00:00 2001
> From: Alexandros Theodotou <[email-masked]>
> Date: Thu, 10 Sep 2020 20:07:32 +0100
> Subject: [PATCH] gnu: Add surge-synth.
>
> * gnu/packages/music.scm (surge-synth): New variable.

Applied with the changes below: added missing import, removed unneeded
‘begin’, followed ‘guix lint’ suggestion for the description.

Thanks,
Ludo’.

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 305a0023b7..899cc6a0e0 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -147,6 +147,7 @@
   #:use-module (gnu packages vim)       ;for 'xxd'
   #:use-module (gnu packages web)
   #:use-module (gnu packages wxwidgets)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xiph)
@@ -799,16 +800,16 @@ audio and video).")
       (modify-phases %standard-phases
         (add-after 'unpack 'replace-python
           (lambda* (#:key inputs outputs #:allow-other-keys)
-            (begin
-              (substitute* "CMakeLists.txt"
-                           ((" python ") (string-append " " (assoc-ref inputs "python") "/bin/python3 ")))
-              #t)))
-        (add-after 'unpack 'fix-data-path
+            (substitute* "CMakeLists.txt"
+              ((" python ")
+               (string-append " " (assoc-ref inputs "python")
+                              "/bin/python3 ")))
+            #t))
+        (add-after 'unpack 'fix-data-directory-name
           (lambda* (#:key inputs outputs #:allow-other-keys)
-            (begin
-              (substitute* "src/common/SurgeStorage.cpp"
-                           (("/usr") (assoc-ref outputs "out")))
-              #t)))
+            (substitute* "src/common/SurgeStorage.cpp"
+              (("/usr") (assoc-ref outputs "out")))
+            #t))
         (replace 'install ; no install target
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (let* ((src (assoc-ref inputs "source"))
@@ -842,8 +843,8 @@ audio and video).")
    (synopsis "Synthesizer plugin")
    (description
     "Surge is a subtractive hybrid digital synthesizer.  Each patch contains
-two 'scenes' which are separate instances of the entire synthesis engine
-(except effects) that can be used for layering or split patches.")
+two @dfn{scenes} which are separate instances of the entire synthesis
+engine (except effects) that can be used for layering or split patches.")
    (license license:gpl3+)))
 
 (define-public klick