From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iL9OCrqYhWJZSAAAbAwnHQ (envelope-from ) for ; Thu, 19 May 2022 03:09:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id YIpRCrqYhWKsNwAA9RJhRA (envelope-from ) for ; Thu, 19 May 2022 03:09:14 +0200 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 F3E4413F75 for ; Thu, 19 May 2022 03:09:13 +0200 (CEST) Received: from localhost ([::1]:49340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrUfA-0004ot-1K for larch@yhetil.org; Wed, 18 May 2022 21:09:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrUf0-0004nC-U7 for guix-patches@gnu.org; Wed, 18 May 2022 21:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40086) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrUf0-0004uB-Lj for guix-patches@gnu.org; Wed, 18 May 2022 21:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrUf0-0002Gt-Gg for guix-patches@gnu.org; Wed, 18 May 2022 21:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54221] [PATCH v4 2/2] gnu: neovim: Search and use installed plugins, like vim. Resent-From: SeerLite Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 May 2022 01:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54221@debbugs.gnu.org Cc: SeerLite Received: via spool by 54221-submit@debbugs.gnu.org id=B54221.16529225088681 (code B ref 54221); Thu, 19 May 2022 01:09:02 +0000 Received: (at 54221) by debbugs.gnu.org; 19 May 2022 01:08:28 +0000 Received: from localhost ([127.0.0.1]:33982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUeR-0002Fx-M9 for submit@debbugs.gnu.org; Wed, 18 May 2022 21:08:27 -0400 Received: from mx.nixnet.email ([94.16.121.167]:40254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUeO-0002Fh-Op for 54221@debbugs.gnu.org; Wed, 18 May 2022 21:08:25 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 1F9412007B5; Wed, 18 May 2022 21:08:20 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652922502; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=BPTsV1dglvHVga2mf8yh6Iov7l6DcnLhUGRHxf7148k=; b=j7gFzf4t1JZOPggiAZ4E1sjM25y42MuyWR9EBvzEn9qpvT5rA7ZBch1Tqp8K7HQlsKX0Bs eUgDtl8G7GCHMr/dJEnSOCvNR8pOvkdvQ4dXg7CP2CZfDbMxI9M9rUceLf5uHQ5IuOLdXE yQNTLpnBNFYI2Yy1ir/XIiPO9UCwMNM= Date: Wed, 18 May 2022 21:08:16 -0400 Message-Id: <1548e2407322432808e83389d07cfc6b92379cae.1652922494.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.36.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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" Reply-to: SeerLite X-ACL-Warn: , SeerLite via Guix-patches From: SeerLite via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1652922554; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=BPTsV1dglvHVga2mf8yh6Iov7l6DcnLhUGRHxf7148k=; b=lvXYl3oEUB2bl8f2sd1/yGmdO7Rt+ZvY5g8ZppaZb+ur5tHxYOCz62Kj5rbrJgoBrRCE+K o7vI+TyHrzojqN0fzMScY+8S6yKbTMnItsHGWB+hESna0nmz3sMU7FkMlTBncgzMHDQcwY oZc/HAmcrR2mPQ8bKx0JSXht2GmvREsOy4CPHiA1OsiBNrhYkW71GUrtuAyAt0QSr6aZpu XS4P3EyKvORCDVsdG3yMrcsOJJW4k3jDuCtaHmm30OCzwmk5ehrfB5Ko3S2k25+TSHzpLa NIhBCuqpXiiaHnz08AHdrd51/+2HQAR2237cm4IgnPC47/9JGfQ6KwhntQ+14Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1652922554; a=rsa-sha256; cv=none; b=WtgsmNKp7K//H+yyeUrGe6eZ8yfvG60nF7sQPLBXwKfTBUwWGHWCe+nRhMFn79GyiEIydQ 6IlSja13M5iBS/HHbHEqnPJ6S13RYgw32+LCaEA1qCL4JCiZAOwjZ1RamiYFhiJARrjfqu lVc3c53n2+B6+Ou3INnYzjB84hk9nlD6xPMtfLsLB3rNsy17BEvqmiNlaACPPGmii5Cfcl wAvL7Lw98KyWwF2C+CKekBbkCefGul3T3PWEiHhKiirvcI/+VVrv9aB6dBAkUxriPcBlTI MY1/YWXzBrhqIB4x/BRZt1ssQ/AgC4XTpLYdns2s5rXxkGHvr0NvHBWpYqtD7w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=nixnet.email header.s=202002021149 header.b=j7gFzf4t; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -3.64 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=nixnet.email header.s=202002021149 header.b=j7gFzf4t; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: F3E4413F75 X-Spam-Score: -3.64 X-Migadu-Scanner: scn0.migadu.com X-TUID: f1XkDThKOuRR * gnu/packages/vim.scm (neovim)[phases]: Add 'install-guix.vim phase and remove trailing #t's. [native-search-paths]: Add search path specification for 'GUIX_VIMRUNTIME'. --- gnu/packages/vim.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 011521babd..7697a03ef6 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -716,16 +716,25 @@ (define-public neovim (setenv "LUA_PATH" (string-join (map lua-path-spec lua-inputs) ";")) (setenv "LUA_CPATH" - (string-join (map lua-cpath-spec lua-inputs) ";")) - #t))) + (string-join (map lua-cpath-spec lua-inputs) ";"))))) (add-after 'unpack 'prevent-embedding-gcc-store-path (lambda _ ;; nvim remembers its build options, including the compiler with ;; its complete path. This adds gcc to the closure of nvim, which ;; doubles its size. We remove the refirence here. (substitute* "cmake/GetCompileFlags.cmake" - (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")) - #t))))) + (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")))) + (add-after 'install 'install-guix.vim + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((vimdir (string-append (assoc-ref outputs "out") "/share/nvim")) + (vimrc #$(local-file (search-auxiliary-file "guix.vim")))) + (mkdir-p vimdir) + (copy-file vimrc (string-append nvimdir "/sysinit.vim"))))))) + (native-search-paths + (list (search-path-specification + (variable "GUIX_VIMRUNTIME") + (separator ",") + (files (list "share/vim/vimfiles"))))) (inputs (list libuv-for-luv msgpack libtermkey -- 2.36.0