From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id MBUgJ/IhuGNyRQEAbAwnHQ (envelope-from ) for ; Fri, 06 Jan 2023 14:28:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id aCkpJ/IhuGOveQAAauVa8A (envelope-from ) for ; Fri, 06 Jan 2023 14:28:18 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E427B17B8F for ; Fri, 6 Jan 2023 14:28:17 +0100 (CET) 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 From: Sughosha via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673011698; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=9u5jxBPsPDF2JVaE3RaYVOd5StnnwszAEEtTn3p3oSE=; b=gM9oIu8nBBvQDm+mlpxCLeq/+nAx1W4pdy+xh2YHwMo6P2ismTc47w6H7Sr6GexziCx74s sVCZ+a2xmcMfP44T1ZHCNggUcyW+TCl9FrubVw8Zb6JhOEqNk0vw6/a/058rkgeNgZ4AbC zm57iYpIhOdQuzH11SjUQcUkUGXrR0QzY0hWxBgny8PBqeUFXIw+ZImkkj7Wvf1s7ALoiQ X+FfH3H3CLdaj4ZaYdxki4djZNgHFZKPz9RnWJKLVN4De6Gd8S8BAkKdTm0GgIWszvi6x1 AR/jHcxI1SUHLWLiPtq1hkXGA7qsCZUeb7XbbYw5m2FGtYn1JSBSAT5m0+exgw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=proton.me header.s=protonmail header.b=kgrKlV6P; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1673011698; a=rsa-sha256; cv=none; b=UW/09s8tZG4udeQYKUuDRObXSHeWJLNBjjyNomf+g26s+JfBNsrZwZyoOh++7gCKkm2n9l Kv+DYh+QAgAWf7MGBjy5Yfs5r2aG47sjUfO02I80N14WSW1hnWU19ReEffNW5wGeB86JuN bE1cP5+njsdazo/L79OhDlgnpp170QI+W9FgkCG3V0c9MYzGtaQQh9VgV3OhbD7Y4TwwPs 4rLeoujYeyiK8bGc8SbO6KSv4KlA7XFDoBoraR4252s5ddRJgy0n8n1WV0tlWd0NZ3SPqS bjiZlz4m2zaGEQ2rWhhg1xAAPy+yRcz5jq/Hyw+bKCUtHlWJ3RmCGktjQ+Y21w== X-Spam-Score: -3.55 X-Migadu-Queue-Id: E427B17B8F Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=proton.me header.s=protonmail header.b=kgrKlV6P; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.55 X-TUID: oWhMVC5lD2+7 This method seems more precise, since if the file or directory does not exi= st, 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_Fon= ts.cpp" + (("/etc/fonts") + (search-input-directory inputs "/etc/fonts"))) + (substitute* + "deps/juce/modules/juce_gui_basics/native/x11/juce_lin= ux_XWindowSystem.cpp" + (("/usr/bin/dconf") + (search-input-file inputs "/bin/dconf")) + (("/usr/bin/gsettings") + (search-input-file inputs "/bin/gsettings"))))) + =20 (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 --=20 2.38.1