From patchwork Fri Jan 6 13:27:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 45879 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 4A38C27BBE9; Fri, 6 Jan 2023 13:28:19 +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=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 F169927BBEB for ; Fri, 6 Jan 2023 13:28:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDmlR-0002Yq-9Q; Fri, 06 Jan 2023 08:28:05 -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 1pDmlO-0002Yg-9a for guix-patches@gnu.org; Fri, 06 Jan 2023 08:28: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 1pDmlN-0004CJ-Ud for guix-patches@gnu.org; Fri, 06 Jan 2023 08:28:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDmlN-0002zy-QM for guix-patches@gnu.org; Fri, 06 Jan 2023 08:28:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59725] [PATCH v2] gnu: paulxstretch: Fix paths. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Jan 2023 13:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59725 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "59725@debbugs.gnu.org" <59725@debbugs.gnu.org> Received: via spool by 59725-submit@debbugs.gnu.org id=B59725.167301164111478 (code B ref 59725); Fri, 06 Jan 2023 13:28:01 +0000 Received: (at 59725) by debbugs.gnu.org; 6 Jan 2023 13:27:21 +0000 Received: from localhost ([127.0.0.1]:54082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDmkj-0002z4-1C for submit@debbugs.gnu.org; Fri, 06 Jan 2023 08:27:21 -0500 Received: from mail-40141.protonmail.ch ([185.70.40.141]:44195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDmkg-0002yo-NO for 59725@debbugs.gnu.org; Fri, 06 Jan 2023 08:27:20 -0500 Date: Fri, 06 Jan 2023 13:27:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1673011632; x=1673270832; bh=9u5jxBPsPDF2JVaE3RaYVOd5StnnwszAEEtTn3p3oSE=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=kgrKlV6P0A0a+UWOFgejyJtnAgQQmiTXM203QFjGUNU2hVmpeq8SzpSCfoJLXq0VT W/2sSIlEBfrS+6joJNuqExmDktTv1Z9d+qU8Tk0Pe0bWYNpE4CzY3ONENgljUjgQ5m meuNhRorWkBfHip82NM5UW9WerpBUrjVnQBNz4UtEcQI+W+xSAyBLSWaSNr6q/8Ojd J3GVjfqRt+eP1GZvKP/tJ/JhZp+8pkASDj7BbqsxxAYpvxpOKi18+hr5C9s9D9sw4S YkwSOl4L5BFliNIbc0UP5C+F1Xa6p7FxrP4QqoSX12SeWxMmrE2Q26VBoVBfr8LhYG 3SGH75HVc752g== 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: , 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 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