From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 2D76IOTDy2XWYAAAe85BDQ:P1 (envelope-from ) for ; Tue, 13 Feb 2024 20:32:52 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 2D76IOTDy2XWYAAAe85BDQ (envelope-from ) for ; Tue, 13 Feb 2024 20:32:52 +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="fCiWq5c/"; 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=1707852772; 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=VzxWRIYZHtktQKuBOx1iRSzF8+cFChZfr192WTpjyYcm1QdgREitMkgHknbqpmvHj/SOBn j5z2BNb365tBmwC9wtLxPOr+xGX1G0Uw46NaTiJVL95WKTS9AXvAYd6f4ovhZ0zjLyXQMZ Zin1g+TLT8J7+oU94ooDKxec9ZuPrsHk85gVfexJ8xrc1wcH17mgbfpyRmTaM5Khyo4XUR ciaAJra4YZ+GAGmHTvZsj3MMz2WD7fEnC070KFVbILbaFQCMD6DmoHYBFJoTvIZuDOCYvY F7Y0ViW66Jnyg4+48eVMZ5BuXQbpRYvV3cVSkjwVmjmWWCtipj2GXoDqW+/jjQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="fCiWq5c/"; 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=1707852772; a=rsa-sha256; cv=none; b=d/Tl79LcYZo6yHQeWbk7pOJYAndv4f1ATfZL7ihGxCiFEdWPHXG5Yr+WAoP5Jw5ZkaZ0rG e8A48EKy7Ge+HwW3sUQegvBJBIK8tKcdxbuz/1rpSiq+VbxQwc2p1/2JcFVrcvVeczOZA0 ZGDvg0q27Df3WAeP9sbSfzAc5XUPG6mRIEtOV69+A1B+Y8BWNKkK1lRcMLgZd4RWwhbhxV 0REDArN1X20i5iRk7va64Koomzd3A9PVNJg141MiG475zKexZH+eiac3L1xNr6dCfrwHbb XSaNRKQSRVPTbg++74HuUOpSsYYHcru/E1DpFb3U8VBsFnafmhfnmUhcOBtYAQ== 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 D7DDB5CFC7 for ; Tue, 13 Feb 2024 20:32:51 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyWC-0007xD-Pi; Tue, 13 Feb 2024 14:32:36 -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 1rZyVX-0007qz-KB for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:57 -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 1rZyVM-0004Ga-Hy for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZyVe-0004Fj-3H for guix-patches@gnu.org; Tue, 13 Feb 2024 14:32: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: Tue, 13 Feb 2024 19:32: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.170785267716210 (code B ref 67260); Tue, 13 Feb 2024 19:32:02 +0000 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:17 +0000 Received: from localhost ([127.0.0.1]:47400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUv-0004DN-Df for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:17 -0500 Received: from mail-lf1-f49.google.com ([209.85.167.49]:61615) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUt-0004Cr-HQ for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:16 -0500 Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-511831801f3so3586561e87.2 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:30:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852592; x=1708457392; 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=fCiWq5c/taiUsyHC3y14QbYPa3eWgIEmDzE9QfxVfAzgasJ71RHIMVrGGxfibWxuy6 gurUd6lzwEthoG84i2O1nb2bA1cojh23Qg/n0jvfnVdNz5qwbakhWCB0zYtDgpxHyZ2W spMkNrybPdfI/uwT8c4Wbmb21AVb0+sj4FzcS29iN+wRs+wZo9Q4Q5ff3q7epHN2eq21 SiyF53xd8Vf2KSF/nDNIH23dTFR4hBLXwpF6oS/1H+/hbli10Pp1wGrZrsTB86YmGT7R ArtL3x9vnxsNQMfKF11vsccnljcvySirdo5C1XjRb+jeyk94f751IFb8qtJwMW7GQTYm ZF4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852592; x=1708457392; 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=bR5APIAvr0LTr4Dz7N44ZBp/hWXxGxI1Urk/RSCiJOg4rKZYoNZPclxihdE7cTl1qk bFEZVwK0g92YSEP6rsviWxxyYxgIDkSDQ0cK1fcgZBGpXqWXMo0S0Hg5Uy1EcD5iBIPk 7N69cRVeKdAqJrWpI8wowiUqQmQgg8Igy1BsguCv5KexhN8ZA2+NXqglfWwX0qQkzJtp +MY6clm85GrhCdzpscJ1IaOybGvhKkb1rEpuRd6yvUfgviWMSDNj+0b3rEMgDZ+7kMms AtkeD9J+xkuGG+ef2Kwl3+EmldtfDo3kNZqz3C6KWwj0TVChmjHGSOhKGTjYqK/6mWN9 vYCA== X-Gm-Message-State: AOJu0Yx4Tu9V0uAc5VLkoRanmJXELBOLxzADcA8Q4ZtLP3RHIKXFPvOC NCnNz821qT1DHEsMX7BjmZY7h6B6ZCAHnxWXmravsmyRI6U6qsbhG7bnYMOo X-Google-Smtp-Source: AGHT+IG8rGi/tne6/LXFijVTmi8IQc1Pgmbq4qxVyCtSzEkmMQGzxOhqIcjVCcr7lI4dBNn5RMpYLQ== X-Received: by 2002:a05:6512:3a8b:b0:511:6764:a8c7 with SMTP id q11-20020a0565123a8b00b005116764a8c7mr455446lfu.10.1707852591610; Tue, 13 Feb 2024 11:29:51 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCU3NqobwQxymWQQzX6WjF1SHt4R2eesN8jMrdSVVfqVJAmGIksBsOiQixULEGtE4rhpbsxkXdHK29nKXM28fOP6ue8BTygzPrReNSKPvplK9Ut0m9LI43nh4vjtYbSd Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:51 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +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+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.03 X-Migadu-Queue-Id: D7DDB5CFC7 X-Spam-Score: 4.03 X-Migadu-Scanner: mx11.migadu.com X-TUID: wSwi1uZUD56Q * 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id WBUuN8LYy2VKGwEA62LTzQ:P1 (envelope-from ) for ; Tue, 13 Feb 2024 22:01:55 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id WBUuN8LYy2VKGwEA62LTzQ (envelope-from ) for ; Tue, 13 Feb 2024 22:01:55 +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=G4AHAxvZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707858114; a=rsa-sha256; cv=none; b=uaVuz7ylJJhk3Tz6xZdUqnC+lkaYWqGZ9s7OGkZ70Ua397PCOpk+ox8902/Ag6mwXIuROe dzry1XaxIrUd6Rrd5e0GHiA2HeIw772k0+xxtA7+1AGJmseHQwosTKkJJFGcY1/DOxf6K0 TQ3bneo5MKVhL6TSMgRhDgYU9XXJ1WdtvbcRw6Kaq+mnhmAGppW1objDqvSN0Cium4YMca giL5ZnWhYhAZaaVY/EiF+v1P0US5s5TrljniQY90wa7zlq/Lc3xXp3asQgo86OoMPZ/XI8 Xo0KEohdqIKirfgVQv2W8HG3LjePrwiaIErikH2WL7wbofc8nmP3X91KrxorEA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=G4AHAxvZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707858114; 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=o7C6YPzcJ+W3xDMoot1koItHX0XBqwU1GcJ5uSghkd1aqVRxS4nLLs2CzyQqX1G5wsZ+8j QZuUcD6rXbn90Ndzue0nEpurcJ30H++buguGsxUu0UcsNFI/ocxCuWZiFyBr7i09WKtZmk 5xNOmF1A+As6ghVoj0sqBd2loVZpnIMWqZUt49KSMzjhufx+z9smkJm8iRhCx2dTjbcKmY FV8QXdmW5wiBLfDETkXt1/r3csvH3NqZPaikfrCfSNqO7DqZJRvrvhaBCOxSPw2d9mlGxz 4DhUH4Dft3Oq+QQ7sDAk9T8hcdsqwRNNSKuGRUdnEWyzJhjDMHLoiXrrykhShQ== 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 C37EE9B5F for ; Tue, 13 Feb 2024 22:01:54 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZzuU-0003w4-9g; Tue, 13 Feb 2024 16:01:46 -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 1rZzuS-0003us-LG for guix-patches@gnu.org; Tue, 13 Feb 2024 16:01:44 -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 1rZzuS-0004QE-Be for guix-patches@gnu.org; Tue, 13 Feb 2024 16:01:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZzuj-0007nU-Ib for guix-patches@gnu.org; Tue, 13 Feb 2024 16:02:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v9 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: Tue, 13 Feb 2024 21:02:01 +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.170785808029772 (code B ref 67260); Tue, 13 Feb 2024 21:02:01 +0000 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 21:01:20 +0000 Received: from localhost ([127.0.0.1]:47899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZzu3-0007jw-PP for submit@debbugs.gnu.org; Tue, 13 Feb 2024 16:01:20 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:60470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZzu1-0007jO-HV for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 16:01:18 -0500 Received: by mail-wr1-f66.google.com with SMTP id ffacd0b85a97d-33ce57b2283so122038f8f.0 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 13:00:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707857994; x=1708462794; 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=G4AHAxvZ4xunvJ9uZo0XX2IbBQGvcP7MoUbcNgmyafgwQRn2eSbJsUwvuykelkFamS 6EjGxwFWftH0+3Z/+gnlzJHVD8lcjLD59dIacLYM496uAPVd6t600azuhN0JKzI8C5KZ r8rEB2N29CyaJbBAVDV0BYVyrUjFlkzGT6vMlC4ONSiPemv4gwEj0rmtDHjYRe1cE8dW rOFwR9E7SXDwwk5sCDtgJvk6U2utefGpw9K2+b+XTo5NW1jKeOX7q6RQAF5k/aDU1ObP UTCmokQbhxTSWJfmV6iRgEW3wFLLHwIXeagLQsJe//G0dzO+pJhl6StrjyMztzFyVgHO /Thg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707857994; x=1708462794; 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=cxfCh+lHNBntSvRT16b7Jg7IuxS74Mr0JjC9rwgjxS/LG/7fsVpphij3NC421cEl05 yL9guKb3k3QxjSQSfabaV+rdPN0WhbX4rFPVkGCKN3XA7Xi8mNBAerfiuVOXl0gewNbC rLzNgDZFBOtyQJHR+bTuvBfojhwKSQ2nyEVclRXA7oqQgM89JQpictxRotTONkvsVKas J8eB+UewiYZZLaDvXxZQTZIEWZ5sHzd1mdC1RkrZ82ygSyjFRgu2mJfxpIeeoUnkZ+I+ JEFm0he9ruYy37m9x57CQkfPKGOsq0nqiS8rm+X1RuO/cZ1kzgOGFo7ItWa3/XPqLhRS /aeA== X-Gm-Message-State: AOJu0Yy/uY/IHyT4cQOXtQlZPb/HkCSbGwavrLOggzSyFIhx/s1riGiE iUZfdNezh5DekZo51Wnab9papqCPN9tQVebBqf6Sx6IoBgK3XfNKguBZ43XJZwg= X-Google-Smtp-Source: AGHT+IHxY1Eyr20CdZUBuLuhyro0cV6zo0oMgUx8QRBRxFI+Zs5Xof02ZaN6rHNI+ZlYZJTAUdHljQ== X-Received: by 2002:adf:a355:0:b0:33a:e76e:8b5c with SMTP id d21-20020adfa355000000b0033ae76e8b5cmr304781wrb.33.1707857993851; Tue, 13 Feb 2024 12:59:53 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUMkkI5uhk7N8FwYPNrg7m/zM8XEsPOdBTvsz02x1e8QN55rwVxFNcEeq6kEk6roZWHVVgBC1kB37Yy9iG3o8hEknh+VSViZVh5cr4hE2YNcrXDvkm0EKhTBGekiV+o Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id bn5-20020a056000060500b0033b3c03053esm10686642wrb.78.2024.02.13.12.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 12:59:53 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +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+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-Scanner: mx10.migadu.com X-Spam-Score: -3.88 X-Migadu-Queue-Id: C37EE9B5F X-Migadu-Spam-Score: -3.88 X-TUID: qhzrOq6bg5iZ Message-ID: <20240213183050.fm6ErEYM1amQ8sJCLk5fQIrMkFGv6ka_eih-7HK5cMU@z> * 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