[bug#59725] [PATCH] gnu: paulxstretch: Fix paths

[bug#59725] [PATCH] gnu: paulxstretch: Fix paths

[Sughosha via Guix-patches via]

* gnu/packages/music.scm (paulxstretch): Fix paths.
[arguments]: Add phase fix-paths.
[inputs]: Add dconf and glib:bin.
---
 gnu/packages/music.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index b69ad2e517..eb15a9f825 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2481,6 +2481,20 @@ (define-public paulxstretch
      (list #:tests? #f                            ;no test suite
            #:phases
            #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-paths
+                          (lambda _
+                            (substitute* "deps/juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h"
+                              (("/usr/include/freetype2")
+                               (string-append #$freetype "/include/freetype")))
+                            (substitute* "deps/juce/modules/juce_graphics/native/juce_linux_Fonts.cpp"
+                              (("/etc/fonts")
+                               (string-append #$fontconfig "/etc/fonts")))
+                            (substitute* "deps/juce/modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp"
+                              (("/usr/bin/dconf")
+                               (string-append #$dconf "/bin/dconf"))
+                              (("/usr/bin/gsettings")
+                               (string-append (ungexp glib "bin")
+                                              "/bin/gsettings")))))
                (replace 'install
                  (lambda _
                    (let* ((bin (string-append #$output "/bin"))
@@ -2507,6 +2521,8 @@ (define-public paulxstretch
     (native-inputs (list pkg-config))
     (inputs (list alsa-lib
                   curl
+                  dconf
+                  `(,glib "bin")
                   fftwf
                   freetype
                   jack-1
-- 
2.38.1

[bug#59725] [PATCH] gnu: paulxstretch: Fix paths

[Ludovic Courtès]

Hi Sughosha,

Apologies for the delay!

Sughosha <Sughosha@proton.me> skribis:

> * gnu/packages/music.scm (paulxstretch): Fix paths.
> [arguments]: Add phase fix-paths.
> [inputs]: Add dconf and glib:bin.

That’s a welcome fix.

>             #~(modify-phases %standard-phases
> +               (add-after 'unpack 'fix-paths
> +                          (lambda _
> +                            (substitute* "deps/juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h"
> +                              (("/usr/include/freetype2")
> +                               (string-append #$freetype "/include/freetype")))
> +                            (substitute* "deps/juce/modules/juce_graphics/native/juce_linux_Fonts.cpp"
> +                              (("/etc/fonts")
> +                               (string-append #$fontconfig "/etc/fonts")))
> +                            (substitute* "deps/juce/modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp"
> +                              (("/usr/bin/dconf")
> +                               (string-append #$dconf "/bin/dconf"))
> +                              (("/usr/bin/gsettings")
> +                               (string-append (ungexp glib "bin")
> +                                              "/bin/gsettings")))))

Could you avoid direct references to packages like #$freetype and
instead use ‘search-input-file’ and ‘search-input-directory’?

  (search-input-directory inputs "/etc/fonts")
  (search-input-file inputs "/bin/gsettings")
  …

There are examples in the repo on how to use them.

Could you send a v2 of the patch to 59725@debbugs.gnu.org?

Thanks in advance,
Ludo’.

[bug#59725] [PATCH v2] gnu: paulxstretch: Fix paths.

[Sughosha via Guix-patches via]

This method seems more precise, since if the file or directory does not exist, build fails.

* gnu/packages/music.scm (paulxstretch): Fix paths.
  [arguments]: Add fix-paths phase.
  [inputs]: Add dconf and glib:bin.
---
 gnu/packages/music.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5be767a138..bdd856396d 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2481,6 +2481,23 @@ (define-public paulxstretch
      (list #:tests? #f                            ;no test suite
            #:phases
            #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-paths
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute*
+                    "deps/juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h"
+                     (("/usr/include/freetype2")
+                      (search-input-directory inputs "/include/freetype2")))
+                   (substitute*
+                    "deps/juce/modules/juce_graphics/native/juce_linux_Fonts.cpp"
+                     (("/etc/fonts")
+                      (search-input-directory inputs "/etc/fonts")))
+                   (substitute*
+                    "deps/juce/modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp"
+                     (("/usr/bin/dconf")
+                      (search-input-file inputs "/bin/dconf"))
+                     (("/usr/bin/gsettings")
+                      (search-input-file inputs "/bin/gsettings")))))
+                    
                (replace 'install
                  (lambda _
                    (let* ((bin (string-append #$output "/bin"))
@@ -2507,8 +2524,11 @@ (define-public paulxstretch
     (native-inputs (list pkg-config))
     (inputs (list alsa-lib
                   curl
+                  dconf
                   fftwf
+                  fontconfig
                   freetype
+                  `(,glib "bin")
                   jack-1
                   libx11
                   libxcursor
-- 
2.38.1

[bug#59725] [PATCH] gnu: paulxstretch: Fix paths

[宋文武 via Guix-patches via]

Sughosha <Sughosha@proton.me> writes:

> This method seems more precise, since if the file or directory does not exist, build fails.
>
> * gnu/packages/music.scm (paulxstretch): Fix paths.
>   [arguments]: Add fix-paths phase.
>   [inputs]: Add dconf and glib:bin.

Hello, paulxstretch will "Segmentation fault" with or without this
patch.  I think that's due to "DynamicLibrary" usages in juce, also it's
better to package juce standalone to get rid of the bundled one from
paulxstretch.

[bug#59725] [PATCH] gnu: paulxstretch: Fix paths

[Sughosha via Guix-patches via]

宋文武 <iyzsong@envs.net> wrote:

> Hello, paulxstretch will "Segmentation fault" with or without this
> patch. I think that's due to "DynamicLibrary" usages in juce, also it's
> better to package juce standalone to get rid of the bundled one from
> paulxstretch.

I don't know why paulxstretch gives "Segmentation fault" error. If I build
it locally (not as a guix package) inside a guix development shell, I don't
get this error. But anyways, even though the executable binary fails to
start, at least the vst plugin works well.

bug#59725: [PATCH] gnu: paulxstretch: Fix paths

[Maxim Cournoyer]

Hi,

Sughosha <Sughosha@proton.me> writes:

> This method seems more precise, since if the file or directory does not exist, build fails.

It also allows Guix users to rewrite package inputs, contrary to the
previous approach which would have hard-coded the references to the
package variables in a definitive way.

> * gnu/packages/music.scm (paulxstretch): Fix paths.
>   [arguments]: Add fix-paths phase.
>   [inputs]: Add dconf and glib:bin.

I've modified the commit message like so:

--8<---------------cut here---------------start------------->8---
gnu: paulxstretch: Patch paths.

* gnu/packages/music.scm (paulxstretch) [arguments]: Add patch-paths phase.
[inputs]: Add dconf, fontconfig and glib:bin.
--8<---------------cut here---------------end--------------->8---

Capitalizing the sentence following the ':', removing the hanging indent
in the GNU Changelog commit message, and adding the missing fontconfig.

> ---
>  gnu/packages/music.scm | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
>
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index 5be767a138..bdd856396d 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -2481,6 +2481,23 @@ (define-public paulxstretch
>       (list #:tests? #f                            ;no test suite
>             #:phases
>             #~(modify-phases %standard-phases
> +               (add-after 'unpack 'fix-paths
> +                 (lambda* (#:key inputs #:allow-other-keys)
> +                   (substitute*
> +                    "deps/juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h"
> +                     (("/usr/include/freetype2")
> +                      (search-input-directory inputs "/include/freetype2")))
> +                   (substitute*
> +                    "deps/juce/modules/juce_graphics/native/juce_linux_Fonts.cpp"
> +                     (("/etc/fonts")
> +                      (search-input-directory inputs "/etc/fonts")))
> +                   (substitute*
> +                    "deps/juce/modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp"
> +                     (("/usr/bin/dconf")
> +                      (search-input-file inputs "/bin/dconf"))
> +                     (("/usr/bin/gsettings")
> +                      (search-input-file inputs "/bin/gsettings")))))
> +                    
>                 (replace 'install
>                   (lambda _
>                     (let* ((bin (string-append #$output "/bin"))
> @@ -2507,8 +2524,11 @@ (define-public paulxstretch
>      (native-inputs (list pkg-config))
>      (inputs (list alsa-lib
>                    curl
> +                  dconf
>                    fftwf
> +                  fontconfig
>                    freetype
> +                  `(,glib "bin")
>                    jack-1
>                    libx11
>                    libxcursor

Applied, after breaking some long lines to fit under 80 chars.

As others reported, there is still the segfault when running the binary,
but at least this probably brings us closer to something that fully works.

Let's open other issues for the remaining problems found.

-- 
Thanks,
Maxim