From patchwork Wed Oct 26 20:01:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 44142 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3FDBC27BBEA; Wed, 26 Oct 2022 21:03:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A6B0A27BBE9 for ; Wed, 26 Oct 2022 21:03:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1onmbb-0005mR-KL; Wed, 26 Oct 2022 16:02:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onmbE-0002GQ-T2 for guix-patches@gnu.org; Wed, 26 Oct 2022 16:02:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1onmbC-0000t4-Iz for guix-patches@gnu.org; Wed, 26 Oct 2022 16:02:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1onmbC-0006xs-4g for guix-patches@gnu.org; Wed, 26 Oct 2022 16:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58572] [PATCH v3] gnu: juce: Fix paths References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Oct 2022 20:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: "58572@debbugs.gnu.org" <58572@debbugs.gnu.org> Received: via spool by 58572-submit@debbugs.gnu.org id=B58572.166681449526741 (code B ref 58572); Wed, 26 Oct 2022 20:02:02 +0000 Received: (at 58572) by debbugs.gnu.org; 26 Oct 2022 20:01:35 +0000 Received: from localhost ([127.0.0.1]:55341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onmak-0006xE-D1 for submit@debbugs.gnu.org; Wed, 26 Oct 2022 16:01:34 -0400 Received: from mail-40138.protonmail.ch ([185.70.40.138]:55541) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onmad-0006ww-W6 for 58572@debbugs.gnu.org; Wed, 26 Oct 2022 16:01:33 -0400 Date: Wed, 26 Oct 2022 20:01:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1666814480; x=1667073680; bh=81MividsCPwdwWYOQnvIklH94JsiWLyy23L0V+UaP8o=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=ec6ew7FoZujNCephEov5smr/sXcXKwsL3i9qULy3AcZaOtU0oH26NJ+/NyOETV1JI 1dSLmrujLimL3F91U2fTyk4IX2AISlu5Tb8kPXItaps5LHVtNWXfyondt0CN1RIOm6 a1KInPxsF87/b5V3R6J6ic/3T9tUmbq9RCcLWt3KsHUpwXjSGruGmgRdOtudkUbAiB Y23Pr2moAD1x2Jpg7CLVqwgCM8+H9YD27V//6H4RSldrvKMRk+mREhcR+YkKIXzeDB dFPkTPbumnW888ZxkjvbcPQuukeV8tGzlQcBnkK90rF5Gl7UL5A/Iuw6wcw+EfH+/M 5ZoGKRlrE32dA== Message-ID: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Guix-patches" Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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