From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 cGPOIWZ29mPgFgEAbAwnHQ (envelope-from ) for ; Wed, 22 Feb 2023 21:09:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 0OjKIWZ29mPtqgAAauVa8A (envelope-from ) for ; Wed, 22 Feb 2023 21:09:10 +0100 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 5F4723C7FA for ; Wed, 22 Feb 2023 21:09:10 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUvQG-0002dW-CL; Wed, 22 Feb 2023 15:09:04 -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 1pUvQE-0002d5-JE for guix-patches@gnu.org; Wed, 22 Feb 2023 15:09:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUvQE-00026B-AH for guix-patches@gnu.org; Wed, 22 Feb 2023 15:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pUvQD-0005In-TQ for guix-patches@gnu.org; Wed, 22 Feb 2023 15:09:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54221] [PATCH 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: Wed, 22 Feb 2023 20:09:01 +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.167709648320308 (code B ref 54221); Wed, 22 Feb 2023 20:09:01 +0000 Received: (at 54221) by debbugs.gnu.org; 22 Feb 2023 20:08:03 +0000 Received: from localhost ([127.0.0.1]:60421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUvPG-0005HK-GM for submit@debbugs.gnu.org; Wed, 22 Feb 2023 15:08:02 -0500 Received: from knopi.disroot.org ([178.21.23.139]:57418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUvPC-0005Gi-Pg for 54221@debbugs.gnu.org; Wed, 22 Feb 2023 15:07:59 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2C8694156D; Wed, 22 Feb 2023 21:07:58 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KKVUx6gPsqCY; Wed, 22 Feb 2023 21:07:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1677096477; bh=42sciHB8kPLxhuuHRVLw1vsrE2MwASno5h/t7oYKK+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bKEYMuVErc8LM/PrZNgg+Anas85kuWrlkYIOiWHt5tIdUd4n5PBtc+xaDaOZRACu8 EgNp+DEubdoVxJ0we6wPI+3JvLAn2WYAZhB6pBylyYf16dlMLF9LtDe9YupGm0SxxQ XMBnmSLrxjnYXpaz/PnNOMp+GHsXMXuU8NCJxFMNQFoKUzZoKc5DROLEMTcwhfEYqu SbVDgme7OuG1W3bew68P3tpSe3oyJ3iCL8VVQZCKnbtbbnV4cMZR3plcgyThq7vqpt eI7eOc3vkNAvHa3OQj7dKLx5kpBuyJGdKLV0/g8w/yoXdmtl21quMZKMNVmCh/xjX0 B8ac9DjlQJx/Q== Date: Wed, 22 Feb 2023 17:07:29 -0300 Message-Id: <0313ee2476aeb999ca0f73609f2eff54865028bc.1677096448.git.seerlite@disroot.org> In-Reply-To: <06694925c423c7e08e49e8384c0009c9f1cd2aa9.1677096448.git.seerlite@disroot.org> References: <06694925c423c7e08e49e8384c0009c9f1cd2aa9.1677096448.git.seerlite@disroot.org> 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: , Reply-to: SeerLite X-ACL-Warn: , SeerLite via Guix-patches From: SeerLite via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=bKEYMuVE; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677096550; a=rsa-sha256; cv=none; b=c1zhCxGBD8Jupkz1jFCGt08yOo4R18rI91yvBoyDTDTmwXURtI0In7omMjMV4xZryFvrDj JPXx1Prd0Y+Lt/gtVM4p/a4vInsAObtRk4ihrH4JhT5vY+Snf7zs2n3rfB8zhTt9Fb4iYG 7IJvazQ8zOWA1AD/FNHNQQsZz3nYH01DY/BBjJ8eOjGXsohgedNhBVaAziEXia7ypNkS3n HQNbQ/Fgy2jZB3gMqEEHN4xjfCI7cZfKFmeHpY+K1R7kdUFBCESt30ua7Mx1+2AQQIYTL8 ta+/Fx6tVGetm1fJEfXdipIiCqd/K+xYS8iaspsiERkBWGUlLETt1zn/Ax/6Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677096550; 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=ysLcXMrAFKAgAbvB4SJUsbVt01USQMNN88ypR2ZtKig=; b=e+I+fYUTxwUwSuwowEgTY/79XPasrPblu7T6Z0lY0XQY4XWdBNFmgJ08vaR2PAGZ63ix4d FRi6R4Ll/YaBK3tly8+hku1yaRG+q78GQBkhVBLCnY4jVEINKh/moPyvo9FFk6/wLNJ5lL LErxDqT8En7NpQlg+tFn1e49ZlXekUoVAxOLTLA9iiFmturnVfLNW4Ob0td90WJZSx5dGD lVkfakfovPazaPuoxcJ2nv/BMAAIexCGQnNsQhmw5WcSkuXmMpBDo/5Te2tslZVE6FCvRM l1oryot6dtviWxLqjhjKnAXLPVV5PkIa2Bx33WZGj9mTgHUEiGsbcqddrFzOKA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=bKEYMuVE; 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=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.16 X-Spam-Score: -3.16 X-Migadu-Queue-Id: 5F4723C7FA X-TUID: GwsQTDn4sfFv * 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 d4e4f88756..c6bcd096a0 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -751,16 +751,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 vimdir "/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.39.1