From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id KNT3BkWhXWPNRwAAbAwnHQ (envelope-from ) for ; Sat, 29 Oct 2022 23:55:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id sFAlB0WhXWO5KQAAauVa8A (envelope-from ) for ; Sat, 29 Oct 2022 23:55:17 +0200 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 8AA9F2BC10 for ; Sat, 29 Oct 2022 23:55:16 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ootnH-0004v5-T5; Sat, 29 Oct 2022 17:55:07 -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 1ootnC-0004l8-UB for guix-patches@gnu.org; Sat, 29 Oct 2022 17:55:02 -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 1ootnC-0008Pz-JE for guix-patches@gnu.org; Sat, 29 Oct 2022 17:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ootnC-0001tl-7R for guix-patches@gnu.org; Sat, 29 Oct 2022 17:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58448] [PATCH] gnu: helm: fix not finding Factory Presets Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Oct 2022 21:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58448 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58448@debbugs.gnu.org Cc: Sughosha , 58448-done@debbugs.gnu.org X-Debbugs-Original-To: Sughosha via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.16670804507233 (code B ref -1); Sat, 29 Oct 2022 21:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Oct 2022 21:54:10 +0000 Received: from localhost ([127.0.0.1]:36811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ootmM-0001sa-6r for submit@debbugs.gnu.org; Sat, 29 Oct 2022 17:54:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:39286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ootmL-0001sN-3b for submit@debbugs.gnu.org; Sat, 29 Oct 2022 17:54:09 -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 1ootmK-0001Pq-UH for guix-patches@gnu.org; Sat, 29 Oct 2022 17:54:08 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ootmI-0008IM-UJ for guix-patches@gnu.org; Sat, 29 Oct 2022 17:54:08 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 8AF2C60003; Sat, 29 Oct 2022 21:54:01 +0000 (UTC) From: Nicolas Goaziou References: <1Hb23qlXeqgl88MZf-yTifjb8ONE252Dzr2UuXWINnpJSUKbtAroTIZsmCKV4SuSkQkVihMEVjP6KiHbdhD1qrjB5GZCqIU6TI4ZeSBH9Xc=@proton.me> Date: Sat, 29 Oct 2022 23:53:59 +0200 In-Reply-To: <1Hb23qlXeqgl88MZf-yTifjb8ONE252Dzr2UuXWINnpJSUKbtAroTIZsmCKV4SuSkQkVihMEVjP6KiHbdhD1qrjB5GZCqIU6TI4ZeSBH9Xc=@proton.me> (Sughosha via Guix-patches via's message of "Tue, 11 Oct 2022 18:34:21 +0000") Message-ID: <87bkpupa88.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=217.70.183.195; envelope-from=mail@nicolasgoaziou.fr; helo=relay3-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1667080516; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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; bh=dMdbxBXQEFrrk7oA8/gp1999j5Shgs3iNGHuGBf0hhY=; b=OT+S8xns3AEGt9AZ6KB/DHKgRUTqaGN0GM3+K7hUTFiAWJsY186CJozPYA0Up2OgI1Vdi8 LbwVgS8XT1XtVsnxiTkWFBbtU4qz9saplb3JWJt61RWdENbXeZ5Yq4PgsItkT4R8Mnrv3w wtQWy/qVHdyx3u0OFyLXp8lDhLMeE4Q/dbuKtHMTEG2TX9PS0THcI6TD7qrKq2/6u3eIWF b+EeVHNSJr3eiLiLLBm9aKaDx75OfKm6UtyxU6+AvaRfVrFxGnb5LsRBn+QxpAXMKW4mOF +6cWH+neRVKjNDYS69vumvbi3HGUvVnY72dIQDKu9m3aI7TTvJRPd0EhyC3Bfg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1667080516; a=rsa-sha256; cv=none; b=JRzJL6z4e/y1EOehqn4e6nIjLiMwxfrjZyvwgo/UI7ltZ4CU2RdxTeKHT2QRNygR43kS3c 2YrwCzRXyT38wQq7rVma2NU4FR0idJU3hwPnqLW1PS48eqxnATnGB8qe7S7aL+DHsanRtH uBfL8kiVrFVL9yO6b3cckjLl0cRNkwGccP3yv67Qt5Ub9U11ZJ05/msCo3HB9BwOlWK82u z162gvFaMcVbMNK76Ro2+ogyXQYxSUcXI5J9aBA4CtoUQm6ZCP7a3LoxF5gpCZOrK4cxzI vQTCxNw6TXeKI/13R0Q8Krv3Pmbscc2ysoNGe+lNUhlGchZEXy1Ubt3Zwi1J0w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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" X-Migadu-Spam-Score: -3.23 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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" X-Migadu-Queue-Id: 8AA9F2BC10 X-Spam-Score: -3.23 X-Migadu-Scanner: scn1.migadu.com X-TUID: yUxcLjL0A3SH Hello, Sughosha via Guix-patches via writes: > * gnu/packages/music.scm (helm): Fix not finding Factory Presets. > This change fixes hardcoded paths so that Factory Presets can be > found. Thank you. Applied with the following changes: > + (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)) I removed trailing #t, and merged both substitute* calls. Regards, -- Nicolas Goaziou