From patchwork Wed Nov 30 15:04:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 44982 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 7C3B327BBEC; Wed, 30 Nov 2022 15:05:26 +0000 (GMT) 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=ham 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 51B4227BBEB for ; Wed, 30 Nov 2022 15:05:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p0Oe8-0003xs-9V; Wed, 30 Nov 2022 10:05:13 -0500 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 1p0Ody-0003ko-BF for guix-patches@gnu.org; Wed, 30 Nov 2022 10:05:02 -0500 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 1p0Ody-0000bn-1V for guix-patches@gnu.org; Wed, 30 Nov 2022 10:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p0Odx-0006CL-Sh for guix-patches@gnu.org; Wed, 30 Nov 2022 10:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59725] [PATCH] gnu: paulxstretch: Fix paths Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Nov 2022 15:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59725 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59725@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.166982068523814 (code B ref -1); Wed, 30 Nov 2022 15:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Nov 2022 15:04:45 +0000 Received: from localhost ([127.0.0.1]:33309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0Odg-0006C2-Sr for submit@debbugs.gnu.org; Wed, 30 Nov 2022 10:04:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:32910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p0OdZ-0006Bj-HA for submit@debbugs.gnu.org; Wed, 30 Nov 2022 10:04:41 -0500 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 1p0OdU-00037c-6o for guix-patches@gnu.org; Wed, 30 Nov 2022 10:04:36 -0500 Received: from mail-4027.protonmail.ch ([185.70.40.27]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p0OdP-0000Xj-1c for guix-patches@gnu.org; Wed, 30 Nov 2022 10:04:31 -0500 Date: Wed, 30 Nov 2022 15:04:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1669820661; x=1670079861; bh=mnowhTiaDNbgnIJR80UvXytMJY9k7+089bNC5fBzNB8=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=mqtFuyfjUZKHhV3mesRH5OaaoinimgwL8IVTbVjc7GTfS+SLf56HSfOcTKq2WzEd8 8rvE5C0tvXniJBTo2tu8svR16cnT4aXxPT7vj5RzWaGvUVQd0JI729uM5t1JX35HCP CL+yCyPjbGuml+nsK9mmCluglgkOWVYgRzSaPOrRBhioP/yvVe0B+YSGfUNrBjdb1c twAu4jA7US9efA9FXeU3N7/3e9keYjpI0ipQeJkjNaVu+12mFeLpenuMa4cUhZ9Zf7 ThQO7K5qe9IjtYIebNNEaPbcmHPbWMNaHTGVMoH59PkjI/IwnILwDFVpeKwbNSacf8 z6vgEdgovvV3A== Message-ID: Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.27; envelope-from=Sughosha@proton.me; helo=mail-4027.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , 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 Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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