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: 60438 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 5FE7A27BBEA; Fri, 16 Feb 2024 15:14:08 +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 4B89F27BBE2 for ; Fri, 16 Feb 2024 15:14:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raztV-0006de-Vi; Fri, 16 Feb 2024 10:12:54 -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 1raztO-0006bt-Mz for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -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 1raztM-000347-Dj for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raztf-0004Jz-LZ; Fri, 16 Feb 2024 10:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v10 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 15:13:03 +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: Suhail , andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170809633916501 (code B ref 67260); Fri, 16 Feb 2024 15:13:03 +0000 Received: (at 67260) by debbugs.gnu.org; 16 Feb 2024 15:12:19 +0000 Received: from localhost ([127.0.0.1]:59901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsw-0004Hy-NT for submit@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:19 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:52231) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razso-0004GY-S7 for 67260@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:13 -0500 Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-41241f64c6bso5851695e9.0 for <67260@debbugs.gnu.org>; Fri, 16 Feb 2024 07:11:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708096245; x=1708701045; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=ZSNqQOQRnn6YTgsSyE6lZVCRb5MMYZLwT79Ig+wxqCU=; b=U0wtR6mr4chYS0LdEdcT5N6JrwZiJqZKbaTZcOr+eavzprSCS0WD87L1pw6Q4lK6d9 4fYUeyEpWv0Ap14YhHPl7Vw8hO+BPpvEIUcKvAg1vQWsq8FBmSzKc1TWmN0gQHgRZ71S KxMkbxKAcjUkcYptSI0499Ij7VATK5mqKWAoqdNEKzJhTiSQxBEwByqxvhBtdR+l2SHb fDY/u5G7RVVeZ7ABlxIzu1V2//ij+DI1yzxJrhJX3FtOlNFb36voYIVf1ednekBZEIYH p8KS4ItqrjqwEWLlCXbKXM2pVq6gCqgESzWXa6wu3w4gUwTyh0eZzyA336VIf0AlQgfh OaYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708096245; x=1708701045; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZSNqQOQRnn6YTgsSyE6lZVCRb5MMYZLwT79Ig+wxqCU=; b=Y3OTyiwDFxYlWE1xtAbPwejJ65dWfTGFZTazL1rjhv0JN2+2Dj8mVecV/wzk8GbmdS NbsELw4WZZ6tyKMq5o+sgQXuwVbFy772FZHgxMfNz4PjD5XTwZjx9nwvBhqKM3R9cW2A wSoA1rD931+c4mJjUNS1e6ZEvvEdC8TznUi95+dck2VRWtGxfarYFnkoMSSqlf6f+vgl JHZLTO6wvAdHQiWtODcSa4oRq+RGDzcB9EjpkQTPhdKlXZT68DppU4Gy25dK8MP+tj54 D2tfF0LjFqOwYeh9M32W4w7u8c/AED+H7ZokxIuIbmWcmKLnyldpsLGgq9aCXQ7ljxsD HoBA== X-Gm-Message-State: AOJu0Yw1geUHvyO3adPjThT5ZNwKoIVK2U5E9P1+z0vv2HBHSAcdq//P 9cIpi8LhSLJHRW7ugqFFN4pfCK9YfoFB7lXVKonPL6f2xvG3572SuHdH7Ov+GDM= X-Google-Smtp-Source: AGHT+IE6Go5hKIkTNZLKtRrB/Jb1rRcZD6o7R4jwRlD1EDp55jJ8wio0sW29keO5w7BvsbbhAWq8VA== X-Received: by 2002:a05:600c:3506:b0:412:1f3f:db1b with SMTP id h6-20020a05600c350600b004121f3fdb1bmr3599288wmq.3.1708096245140; Fri, 16 Feb 2024 07:10:45 -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 o21-20020a05600c4fd500b00410ab50f70fsm2596052wmq.15.2024.02.16.07.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:10:44 -0800 (PST) Message-ID: In-Reply-To: References: 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(-) 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