From patchwork Tue Feb 13 18:30:50 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: 60282 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 3DEA727BBEA; Tue, 13 Feb 2024 19:32:52 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 C951627BBE2 for ; Tue, 13 Feb 2024 19:32:51 +0000 (GMT) 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+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