From patchwork Sat Mar 15 13:07:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 40199 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 E34AA27BBEA; Sat, 15 Mar 2025 13:08:23 +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=-5.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 8987C27BBE2 for ; Sat, 15 Mar 2025 13:08:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ttRFH-0002yl-21; Sat, 15 Mar 2025 09:08: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 1ttRFE-0002yX-Kn for guix-patches@gnu.org; Sat, 15 Mar 2025 09:08:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ttRFE-0003ec-9b for guix-patches@gnu.org; Sat, 15 Mar 2025 09:08:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=HiXh69LjKnw64anWpqo2Swr3UpppAqJwnmk3MJ8PLp4=; b=DWuW8rdqY7qmSn5riLTD9KUKGbcDxX/eSxtDscbjzx5s1ijQTBzrToVXtQmDjeibjYYeIq/BSJR5KkLZ7R2tYggcXMAGBwppIpkGQWVDZ3syu9j+SBZO73dpNbQV6SIBhlqzWW9qPfGDWkENxCn2Lg3glyvq583NA39WV2we+LPsCpl87Q8zLSqy4Wjp0ri1a2BvYi3PNX8W8PzOwO6a1Flc6LUw4c2yQPxHJELchYtv4DgrKOPGtQVS69c9u3tCbKXmkEnGmjRpDW4hXKrXNLQRNlddT4McWQtFsjn2Vo1aVOESX91k+B+URnDf8BLy5hUb/va3wnjNOIXpwYoQcg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ttRFE-0001Mb-3V; Sat, 15 Mar 2025 09:08:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77034] [PATCH 2/2] gnu: emacs-minimal: Adjust Guix paths in snippet. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, csantosb@inventati.org, divya@subvertising.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 15 Mar 2025 13:08:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77034@debbugs.gnu.org Cc: Hilton Chain , Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 77034-submit@debbugs.gnu.org id=B77034.17420440755173 (code B ref 77034); Sat, 15 Mar 2025 13:08:04 +0000 Received: (at 77034) by debbugs.gnu.org; 15 Mar 2025 13:07:55 +0000 Received: from localhost ([127.0.0.1]:39767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ttRF4-0001LM-NB for submit@debbugs.gnu.org; Sat, 15 Mar 2025 09:07:55 -0400 Received: from mx.boiledscript.com ([2a01:4f8:10b:392::42]:41716) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ttREv-0001K4-VI for 77034@debbugs.gnu.org; Sat, 15 Mar 2025 09:07:46 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1742044064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HiXh69LjKnw64anWpqo2Swr3UpppAqJwnmk3MJ8PLp4=; b=BTIwYZMpj3OmUp25BWPInd8M5RYnET3zZUOSGWiwenGG2ksV8arc5tzFMCEg1jv1CBzNye F7/aEizlTr1wbwlTRCvZ5e94MquaTG7g1zznbVr1T2yRNlCE+ALRTVJijLHX/HI8UvxZB3 Y4q5VSf3qtyyh8Dms3/Vpi9xzoXYj7QWDWUj6f4imBshzSa0O8DTiuZT8FguLTUabBkBWd +DroU5EJ1hfpWsTWM2M9qa+eyyWeWOoxc4wkgczR3TUNJTCErE21i8FzQhTxEi7uy9Yfr4 ywccR4l9FtjclT1ZskNg1ZkndiVaBOYQ2dtLefwjwbjjr07iuOmXqt4/44UqpQ== Date: Sat, 15 Mar 2025 21:07:13 +0800 Message-ID: <1e9a5331a228935069a5c9cd0ed025c6f9b2b2b8.1742043559.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-MS-Reactions: disallow 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-minimal)[source]: Add "/run/privileged/bin" and Guix Home paths to ‘tramp-remote-path’. Add Guix Home path to ‘Man-header-file-path’. Change-Id: I20536ae93c74e06eafa5fd26a1b421680c177102 --- gnu/packages/emacs.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 32733f7b35..eb863110c0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -135,10 +135,13 @@ (define-public emacs-minimal (substitute* "net/tramp.el" ;; Patch the line after "(defcustom tramp-remote-path". (("\\(tramp-default-remote-path") - (format #f "(tramp-default-remote-path ~s ~s ~s ~s " - "~/.guix-profile/bin" "~/.guix-profile/sbin" - "/run/current-system/profile/bin" - "/run/current-system/profile/sbin"))) + (format + #f "(tramp-default-remote-path ~s ~s ~s ~s ~s ~s ~s " + "/run/privileged/bin" + "~/.guix-profile/bin" "~/.guix-profile/sbin" + "~/.guix-home/bin" "~/.guix-home/sbin" + "/run/current-system/profile/bin" + "/run/current-system/profile/sbin"))) ;; Make sure Man looks for C header files in the right ;; places. @@ -147,7 +150,8 @@ (define-public emacs-minimal (string-join (list line "\"~/.guix-profile/include\"" - "\"/var/guix/profiles/system/profile/include\"") + "\"~/.guix-home/include\"" + "\"/run/current-system/profile/include\"") " "))))))) (build-system gnu-build-system) (arguments