From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp1.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms8.migadu.com with LMTPS
	id kIIsJblutWUVLgAA62LTzQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sat, 27 Jan 2024 21:59:37 +0100
Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp1.migadu.com with LMTPS
	id kIIsJblutWUVLgAA62LTzQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sat, 27 Jan 2024 21:59:37 +0100
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=BKKTxx1p;
	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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none)
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1706389177;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version: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=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=;
	b=K8dyXD/lJdnIB7OjIuPBI2hT7WzPpEeqaZBjrfRZj69dIk4/CfJsubOWE4HvokeMSfmZns
	xKeu/PKti2s9ar76yYCNrOsNN5Vqvb6xJofBtbYw0OeY/y4vkA8Ttzz6Q/Bi6eHLVmkLjC
	B5iV7puDtmevLLuZQ9qKLWsVOZN9XsACY6PZKM5o52leHgkNE5Bf+baQO0Hyup0e/Od4bZ
	YKmtQSm47+24uN1pm88hgzVSseijjKJV8a4AEXPUp/Hymo52S5KwgqFlwe5b/8XtcGy7Im
	5ZdpqgAsYMzmHItRFL8T6ggCrrGQQvfn5lW+D0V6UiizTA+3wyderOU4g293nw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=BKKTxx1p;
	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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none)
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1706389177; a=rsa-sha256; cv=none;
	b=jjL/XUveEJdT/J26p2X198IwpcgpCxXsRjaHnOOkF2uQm7f9qYLzXYPHMLAftzgIhWL6jT
	Yj8u5wMOFVuQEDQfpMYPV3qevSMnIlwMyYA3GUIIfQ4BOvMo9RmCx3zW3dZKE7vVOs5rPc
	7fJRz1rrla3Fc2jBaMHK+1Tz1cIppTRHz7g/kEhjbOXeLpm8UWPCc8pCv3fKRmjvX4k+Fy
	d89OG7w1oGmfsawGnrTxVVZ23lxpvbA7BLTb4U+ZSxTQ7TLGui44A/IOqKHQESZ7pIPxgw
	ZSVbRt5uWDVE5PXYsDXNeYa9lKs4fHgilzTLFwmCquXH0WlAvoRUAXdbi+lSDw==
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 7E2945CF30
	for <larch@yhetil.org>; Sat, 27 Jan 2024 21:59:37 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1rTplQ-0004sm-IP; Sat, 27 Jan 2024 15:58:56 -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 <Debian-debbugs@debbugs.gnu.org>)
 id 1rTplP-0004sF-9s
 for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58: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 <Debian-debbugs@debbugs.gnu.org>)
 id 1rTplP-0005qB-1E
 for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:55 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1rTplV-000561-VJ
 for guix-patches@gnu.org; Sat, 27 Jan 2024 15:59:01 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#67260] [PATCH v8 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH.
References: <cover.1700314926.git.liliana.prikler@gmail.com>
In-Reply-To: <cover.1700314926.git.liliana.prikler@gmail.com>
Resent-From: Liliana Marie Prikler <liliana.prikler@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Sat, 27 Jan 2024 20:59:01 +0000
Resent-Message-ID: <handler.67260.B67260.170638910019495@debbugs.gnu.org>
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 <suhail@bayesians.ca>,
 andrew@trop.in
Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170638910019495
 (code B ref 67260); Sat, 27 Jan 2024 20:59:01 +0000
Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:20 +0000
Received: from localhost ([127.0.0.1]:56035 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1rTpkq-00054C-6F
 for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:20 -0500
Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:49226)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <liliana.prikler@gmail.com>) id 1rTpkm-00053S-9c
 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:19 -0500
Received: by mail-ej1-x641.google.com with SMTP id
 a640c23a62f3a-a357cba4a32so8680466b.2
 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:08 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1706389083; x=1706993883; 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=BKKTxx1prubQn/yNOr+OP+t3On58djdG/frDz6VOdQn+dNkFFb/EANKhjB+4xVDlme
 epgOq4rRz1kEkLtVJakGLNdWYwqrX7UF51VP/NdhCoQTb8NnNEWFncJCMlbIDcHG67nU
 mMvC1AXyfob+Jul4cUS4Lb4LW5nCSGdQoSTwLlYMI3YQkUZ4GqepChrvKHlWqiO++uFm
 PmB+WJpfm39h12sjxGSIKVikRFYQVwvV67o5mVFDGkmjH3uuxYGKHNT7hWIfZNU0B9DQ
 hvLLmWYi8r4EsOowAGuCs6FR3yrtLIOykNOHQ2PmiC1tF8rtM/GkBU31e7gyyID/tGZN
 8ZSw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1706389083; x=1706993883;
 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=cu59ZHNDKcUv3w3nMqhk+adxmCFwh22pe3NB4sFTjXg7Y+4mScr7PV9D8nb9X3/MBV
 UI8iYvcLTb2Nf900xmwD6D/GFsKSGCcnmGh49B8ooOwScmcDZVdAxSb0Uzvl7rnAEtgn
 bUCL4unMbXMBkD0Yn/H+0sKGk3X0KJDzW3MHYzc1ttPPWXlJ5dPdO2/xmysY1qaC7Aen
 ggxJDo8MiC2vNtY9LgRRSi+WHvyDXbYYoQ/XlFPGn9ERYWPaWi8uMWcPBnKtGp+h7oU6
 jyXXa7kQ3SodFAd5lsLMvVR/3DFxv/vnwY6+qGXZIHlGHxi2SyU4AC7whbe8mLH9cdIg
 EYaw==
X-Gm-Message-State: AOJu0YyNqb++e0+aGSAE+FnUUkHecA0iIi+OJkYUliCFFHlwanP9zv1I
 Dzr9vGqT1Gpbp/z2rdQxCy8jaB9R3xEkg6aXyecQezoTYo6ZZKjC3bl7ENnm6kQ=
X-Google-Smtp-Source: AGHT+IHS9lugUGglP+TYAa0re4Zq2kxMhXpiXWA+EOspkb7DFzx7lt4SFiy5/usAX6EpuyUzI5TKBg==
X-Received: by 2002:a17:906:a04e:b0:a34:d1a9:77ad with SMTP id
 bg14-20020a170906a04e00b00a34d1a977admr1601315ejb.22.1706389082980; 
 Sat, 27 Jan 2024 12:58:02 -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
 q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.02
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 27 Jan 2024 12:58:02 -0800 (PST)
Message-ID: <cd8877121c4b0b761e4de3fd2388cbcb615a932d.1706389058.git.liliana.prikler@gmail.com>
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
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: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Spam-Score: 4.85
X-Migadu-Queue-Id: 7E2945CF30
X-Spam-Score: 4.85
X-Migadu-Scanner: mx11.migadu.com
X-TUID: aJ1w268QQHVI

* gnu/packages/emacs.scm (emacs-minimal)[wrap-emacs-paths]: Also wrap
EMACSNATIVELOADPATH.
---
 gnu/packages/emacs.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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

base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660
-- 
2.41.0