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: 59489 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 186E027BBE9; Sat, 27 Jan 2024 20:59:39 +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 6F82F27BBE2 for ; Sat, 27 Jan 2024 20:59:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) 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 ) 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 ) 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 ) 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: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 20:59: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.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 ) 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 ) 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: 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