unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sughosha via Guix-patches via <guix-patches@gnu.org>
To: "58572@debbugs.gnu.org" <58572@debbugs.gnu.org>
Subject: [bug#58572] [PATCH v3] gnu: juce: Fix paths
Date: Wed, 26 Oct 2022 20:01:11 +0000	[thread overview]
Message-ID: <HSDlf_GyeYmgvQQIAYZM16BGhK-0TaUmf4LoxuFaPR5luuD1TMZGwP3uDbOLpWyS8bJQFlMPWhctnRRKm_U8gGCet3MqYy0FMXVagI4KWUo=@proton.me> (raw)
In-Reply-To: <jxwJaej_vbaAUEYQRcM8uYOXErfjrthh65jDZ_uCi99LLOneM-6ME5rBqKK-V_wLZ8wF0X4Vvs6T510LVYnASoJj_HIS8t4Ra6dbK9ZLEPM=@proton.me>

* gnu/packages/music.scm (juce)[arguments]: Fix paths.
[inputs]: Add dconf, fontconfig and glib:bin.
[propagated-inputs]: Add xdg-open.
---
 gnu/packages/music.scm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 6d0fd1e9c0..2fee51ed1f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1890,14 +1890,33 @@ (define-public juce
     (build-system cmake-build-system)
     ;; TODO: Use installed packages instead of bundled dependencies.
     (arguments
-     (list #:tests? #f)) ;no test suite
+     (list #:tests? #f ;no test suite
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'fix-paths
+                          (lambda _
+                            (substitute* "extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h"
+                              (("/usr/include/freetype2")
+                               (string-append #$freetype "/include/freetype")))
+                            (substitute* "modules/juce_graphics/native/juce_linux_Fonts.cpp"
+                              (("/etc/fonts")
+                               (string-append #$fontconfig "/etc/fonts")))
+                            (substitute* "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"))))))))
     (native-inputs (list pkg-config))
     (inputs (list alsa-lib
                   curl
+                  dconf
+                  fontconfig
                   freetype
+                  `(,glib "bin")
                   jack-1
                   libx11
                   python))
+    (propagated-inputs (list xdg-utils)) ;for xdg-open to open web browser
     (home-page "https://juce.com")
     (synopsis "Cross-platform C++ application framework")
     (description
-- 
2.38.0





      parent reply	other threads:[~2022-10-26 20:03 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-16 19:23 [bug#58572] gnu: Add bespokesynth Sughosha via Guix-patches via
2022-10-16 19:36 ` [bug#58572] Add missing patches Sughosha via Guix-patches via
2022-10-17 19:28   ` Sughosha via Guix-patches via
2022-10-26 20:01 ` Sughosha via Guix-patches via [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='HSDlf_GyeYmgvQQIAYZM16BGhK-0TaUmf4LoxuFaPR5luuD1TMZGwP3uDbOLpWyS8bJQFlMPWhctnRRKm_U8gGCet3MqYy0FMXVagI4KWUo=@proton.me' \
    --to=guix-patches@gnu.org \
    --cc=58572@debbugs.gnu.org \
    --cc=Sughosha@proton.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).