From patchwork Mon Jan 22 20:21:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59454 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 E0E1627BBE2; Sat, 27 Jan 2024 07:05:18 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 E89D527BBE9 for ; Sat, 27 Jan 2024 07:05:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTckL-00024Y-3M; Sat, 27 Jan 2024 02:04:57 -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 1rTckJ-00022X-Ig for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:55 -0500 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 1rTckJ-0004yI-Al for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTckQ-0002YK-6C for guix-patches@gnu.org; Sat, 27 Jan 2024 02:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v7 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 07:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.17063390619683 (code B ref 67260); Sat, 27 Jan 2024 07:05:02 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:21 +0000 Received: from localhost ([127.0.0.1]:53329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjk-0002W5-JJ for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:20 -0500 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]:55297) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcji-0002Vf-MJ for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:19 -0500 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-5102e2ab56eso295799e87.2 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339046; x=1706943846; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=SWvRJBgRnNr3LQLoUq1Xn3YgJvO0XhnKjND/itlKcgKOGZu8Rxt9fAv0kx8LyA9mol SRzIO3wJahc3VkeuCyNykIMr7QFBHPuH6iCcsdBXF7OfK3YyOlZrl+FZDKhAc84JY8zN Cwcz9Owv6x6xRvnMl+rRoRWoA1CKx3CSzcyvnIq9iid/sm94cdT4tHMr+GR/cl3kukZw I+p+kkKvFOiZY30izW34bmo2JAueQIqeVfSKZC+JLw2Vculu8baDaJvrGK7eCScd7HYN ZkpIwZaxGo+jE/0LrYKOMQw7p/RHfI+QWHXjtQ8QV7TWzmYxp+QVaScRRsRqRVGjTw85 I31A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339046; x=1706943846; h=mime-version:cc:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=bF6COgba9FiUINq5zFMbnfbjsx1Jltegig5BqCVUzPCfG7XbhKCMRSRl9dYlAyhuF+ +JHtIMZocm3jcfAGVQkpo8O5KEZSxjn1H5rkDo8mWc/eIjxiKH5QO5o6hFYna/zKPJBR Dwwl5dyKJoDOUdaehIT+/Pwf2Q5vAJfOVm+yw3WTbtD7PwPwmU4CHMfqc0OVBMroW2Li l+TuX/3eE1Ct0VO5EfzWaAMNAyZ/PynmE5dlx4zzG2xbo2sD1rBWl6akgoa7Ha/2A7cZ 2xOhzIK330Am78aJRCoDOKL/sSFGGy7hZpmkto3Sh/k6z0oLIwNcYiG3yGS3n4CawAGI /pBw== X-Gm-Message-State: AOJu0YxXr3pHXR8w5TsPR+ZIY3XPsNXYII7bxKKDngduBDv5kkn7v/IO I1fF3HtxNvj0mNVcBuPHTdGTx14MOC0jq78g0+YhuO0+d0r4FinR9hqs2iYR X-Google-Smtp-Source: AGHT+IHuABlkleAdsqtzfvqjhcfdMJSsQXSQ88IOc2dEGC+d9JlWSrNKfPtzL1zng0Gyg+/pshUCPw== X-Received: by 2002:ac2:546f:0:b0:50e:2c05:5773 with SMTP id e15-20020ac2546f000000b0050e2c055773mr514355lfn.27.1706339045482; Fri, 26 Jan 2024 23:04:05 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:05 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Mon, 22 Jan 2024 21:21:26 +0100 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: , 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)[wrap-emacs-paths]: Also wrap EMACSNATIVELOADPATH. --- gnu/packages/emacs.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5f27c551e0..2cdc9b8bca 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -273,7 +273,11 @@ (define-public emacs-minimal (let* ((out (assoc-ref outputs "out")) (lisp-dirs (find-files (string-append out "/share/emacs") "^lisp$" - #:directories? #t))) + #:directories? #t)) + (native-lisp-dirs (find-files + (string-append out "/lib/emacs") + "^native-lisp$" + #:directories? #t))) (for-each (lambda (prog) (wrap-program prog @@ -285,7 +289,11 @@ (define-public emacs-minimal (list (search-input-file inputs "/bin/gzip") ;; for coreutils (search-input-file inputs "/bin/yes")))) - `("EMACSLOADPATH" suffix ,lisp-dirs))) + `("EMACSLOADPATH" suffix ,lisp-dirs) + ;; Note: the interpretation order of EMACSNATIVELOADPATH + ;; is reversed, so 'prefix functions just like 'suffix + ;; for EMACSLOADPATH. + `("EMACSNATIVELOADPATH" prefix ,native-lisp-dirs))) (find-files (string-append out "/bin") ;; Matches versioned and unversioned emacs binaries. ;; We don't patch emacsclient, because it takes its