From patchwork Tue Oct 11 18:34:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43332 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 3FB7D27BBEA; Tue, 11 Oct 2022 19:41:31 +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 06C9827BBE9 for ; Tue, 11 Oct 2022 19:41:31 +0100 (BST) Received: from localhost ([::1]:47906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiKC2-0005x2-3r for patchwork@mira.cbaines.net; Tue, 11 Oct 2022 14:41:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiK5m-0001wY-DZ for guix-patches@gnu.org; Tue, 11 Oct 2022 14:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiK5m-000606-2f for guix-patches@gnu.org; Tue, 11 Oct 2022 14:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiK5l-000502-Ra for guix-patches@gnu.org; Tue, 11 Oct 2022 14:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58448] [PATCH] gnu: helm: fix not finding Factory Presets Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Oct 2022 18:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58448 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58448@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.166551328119182 (code B ref -1); Tue, 11 Oct 2022 18:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Oct 2022 18:34:41 +0000 Received: from localhost ([127.0.0.1]:54806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiK5R-0004zI-Dv for submit@debbugs.gnu.org; Tue, 11 Oct 2022 14:34:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:53590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiK5O-0004z9-Ps for submit@debbugs.gnu.org; Tue, 11 Oct 2022 14:34:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiK5O-0001Z1-Jk for guix-patches@gnu.org; Tue, 11 Oct 2022 14:34:38 -0400 Received: from mail-4324.protonmail.ch ([185.70.43.24]:35913) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiK5K-0005wW-EU for guix-patches@gnu.org; Tue, 11 Oct 2022 14:34:38 -0400 Date: Tue, 11 Oct 2022 18:34:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=nwu4olw7prcvrdqfgnw6wcbv5y.protonmail; t=1665513269; x=1665772469; bh=xPDCv3AslfQzBqOh8WIrTkX4jCu4nnzqHQMTQ5OIZrA=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=HwhLQppMvGNU028O9vp5UstFXPDRYiTsNoG7bn5SZVmd5KbavcwbP5ELJxwPjeoTV ZOr7P3OWGC0BfYzGd6RgNBNrEEyRFaMD+n8Ep5qlDJweASLzIph+UR/uB1wE9uyBv1 /Zkvt0/w7Sy8X03wZgnHyE9Mxmu3T+Vp8OecYleIYppwn9fVm2F/DOE16VeD01uzsh Uyx4hbmQG4a8JU9fQ/hb4mHBSy4V3ynRSwQY+b7yDb6Lig87iIyyP7y7F/K8gxk6rf KLD4PazTmheQ5TZmdvnwKBlY6wcuhcdWM4+aCBVEhWniejhr5yku77yVRZa1aVHy0e WlRNHRDFGujMA== Message-ID: <1Hb23qlXeqgl88MZf-yTifjb8ONE252Dzr2UuXWINnpJSUKbtAroTIZsmCKV4SuSkQkVihMEVjP6KiHbdhD1qrjB5GZCqIU6TI4ZeSBH9Xc=@proton.me> Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.24; envelope-from=Sughosha@proton.me; helo=mail-4324.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha X-getmail-retrieved-from-mailbox: Patches * gnu/packages/music.scm (helm): Fix not finding Factory Presets. This change fixes hardcoded paths so that Factory Presets can be found. --- gnu/packages/music.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6b37c79389..000b372303 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6144,6 +6144,13 @@ (define-public helm (substitute* "Makefile" (("/usr") "")) #t)) + (add-after 'unpack 'fix-hardcoded-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/common/load_save.cpp" + (("/usr") (assoc-ref outputs "out"))) + (substitute* "src/editor_sections/patch_browser.cpp" + (("/usr") (assoc-ref outputs "out"))) + #t)) (delete 'configure)))) (inputs `(("alsa-lib" ,alsa-lib)