From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id IDSqFR4qjGLSvwAAbAwnHQ (envelope-from ) for ; Tue, 24 May 2022 02:43:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2GV6FR4qjGJzlwAAauVa8A (envelope-from ) for ; Tue, 24 May 2022 02:43:10 +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 B11AC20BAF for ; Tue, 24 May 2022 02:43:09 +0200 (CEST) Received: from localhost ([::1]:43596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntIdg-0002ja-8i for larch@yhetil.org; Mon, 23 May 2022 20:43:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntIda-0002ic-AN for guix-patches@gnu.org; Mon, 23 May 2022 20:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56567) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ntIda-0008Ga-0Q for guix-patches@gnu.org; Mon, 23 May 2022 20:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ntIdZ-0000ak-VD for guix-patches@gnu.org; Mon, 23 May 2022 20:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54221] [PATCH v6 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: Tue, 24 May 2022 00:43: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.16533529322201 (code B ref 54221); Tue, 24 May 2022 00:43:01 +0000 Received: (at 54221) by debbugs.gnu.org; 24 May 2022 00:42:12 +0000 Received: from localhost ([127.0.0.1]:50463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntIck-0000ZQ-TU for submit@debbugs.gnu.org; Mon, 23 May 2022 20:42:12 -0400 Received: from mx.nixnet.email ([94.16.121.167]:40520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntIcg-0000Z8-EN for 54221@debbugs.gnu.org; Mon, 23 May 2022 20:42:06 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id C9FEA20046A; Mon, 23 May 2022 20:42:00 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1653352921; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=l4UNo4KqF27O4u40bXpCZIE4sxRnL0roQAWLNV+tH7M=; b=cg3G28Bo0vJ4ptETiKMLn6B/BSgkL1lC8HVP0VPui/COz8u6H1IFxcohhEDTDIaWsSsEK2 AHXsZVzI0Cku7J7pTLGbYCCwOdUEQABF2EV8mDN32R9aAtFRVi1/X+b9ZR33i6+vG0LTDC I8jlskx+Fzpv4IOPhkuTSgpKwYj1aLE= Date: Mon, 23 May 2022 20:41:55 -0400 Message-Id: <81b3246dc028d82086a94bef402cb539a5b7184a.1653352914.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.36.0 In-Reply-To: <81321483b3ea03870a94a5fce3931ba176269f73.1653352914.git.seerlite@nixnet.email> References: <81321483b3ea03870a94a5fce3931ba176269f73.1653352914.git.seerlite@nixnet.email> 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=1653352990; 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=l4UNo4KqF27O4u40bXpCZIE4sxRnL0roQAWLNV+tH7M=; b=VXb+LylKXf3HpTRZnd3pws3wtT3xe4X6P8f9DvnhlO05UtTKVkzVmBp6U5Y+coHo/hIyVM 3ObaPOCgSzRPw5FI639by0jtQ2xVlJcOIQN905pMhj+nKDw+lUTi7MS1JgJhKPJDRb+nEl AM00sViLy7YL2qsm5tRjiNnq2/CVD5qso+9UpO+bX7mpdp7ZRbymh90C2d1rY34T5tZ4LK EYxiZ1AiSMCZJuYgXkGrZNWPNsh785+nKeNZEDIvVkLyhSMjcGDH3gK2qgsvHd4Z/H3w4d lRl9Lzp/WM92/HPzMYtoKfK9pxdERE38BlBHlSEglbxLI8UxFwT+MC8GQbs4dg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653352990; a=rsa-sha256; cv=none; b=AHzgLtoferfRg7+9Aw17y/04jqkeI0OBcCf1BhXlIXk+jhNZf0DQq4nzBLHluRvvotqz/m oGdR+uxnDLb+U/yEDdLOj3kiC4ifSuqLrrOVp6bdTd4E7xfDVvbuRT+fsZXKQTwFLJl3DI goUHa1k7XJHq7HsT3tO4GAg3rF+AKJ8fJc3fkk4ggmvcqqJz8dqJL8a9EwGWEdrqn6E+/M Ty/mVoPKAtXH9DerBZ4DPgIdcxro5Nythlh070SuaFfIFhKLJWBHqn0+v8VjCD9r/LwuPW 4S9bks8o8/3oCzxuUe2TuXh4QjlFfsRUYhVdLsBEEKxUxzLhr4PKyBnMM7gIwg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=nixnet.email header.s=202002021149 header.b=cg3G28Bo; 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: -2.65 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=nixnet.email header.s=202002021149 header.b=cg3G28Bo; 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: B11AC20BAF X-Spam-Score: -2.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: bXxNY1GeDniq * 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 791aecbb83..5e3cb4484d 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 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.36.0