From patchwork Wed Mar 2 13:17:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeerLite X-Patchwork-Id: 37576 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 191FB27BBEA; Wed, 2 Mar 2022 13:29:26 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED 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 D4FFD27BBE9 for ; Wed, 2 Mar 2022 13:29:25 +0000 (GMT) Received: from localhost ([::1]:38004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPP2i-0005M1-QZ for patchwork@mira.cbaines.net; Wed, 02 Mar 2022 08:29:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPOtf-0001kc-EB for guix-patches@gnu.org; Wed, 02 Mar 2022 08:20:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45473) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPOtf-0000UF-3L for guix-patches@gnu.org; Wed, 02 Mar 2022 08:20:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nPOte-0002RZ-VI for guix-patches@gnu.org; Wed, 02 Mar 2022 08:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54221] [PATCH 2/4] 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, 02 Mar 2022 13:20: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.16462271889320 (code B ref 54221); Wed, 02 Mar 2022 13:20:02 +0000 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 13:19:48 +0000 Received: from localhost ([127.0.0.1]:39360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtP-0002QF-St for submit@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:48 -0500 Received: from mx.nixnet.email ([94.16.121.167]:56638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtO-0002Q0-Jp for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:47 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 03EEF2020E7; Wed, 2 Mar 2022 08:19:44 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1646227186; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=FGn2RtqG+omSIqoSvtOy1imHWWHz0ee1V9UsU+NTRTg=; b=Oy5c+825I4sbuP7M/qEs9qryWWR8+4OsNfNckW8mZKiRDkmylp9CBrtm+097HQi0+voq3M MFfuIlCRuHoXTOyxN40Q230VAaHxqAtbuF0GI8uNjl7ufR/FeZ2NtM5trFm6cnH30Fa/YM IDBF1jc+mUixM9L0Rfn3GmFLztaPOQU= Date: Wed, 2 Mar 2022 10:17:33 -0300 Message-Id: <39a5e8f9c8f4e3fee5f36824780296f55995ae33.1646227054.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: 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" Reply-to: SeerLite X-ACL-Warn: , SeerLite via Guix-patches X-Patchwork-Original-From: SeerLite via Guix-patches via From: SeerLite X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vim.scm (neovim)[phases]{install-guix.vim}: New phase. [native-search-paths]: Add search path specification for 'GUIX_VIMRUNTIME'. --- gnu/packages/vim.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 7407ae71d7..3997797201 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -714,7 +714,18 @@ (define-public neovim ;; doubles its size. We remove the refirence here. (substitute* "cmake/GetCompileFlags.cmake" (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")) - #t))))) + #t)) + (add-after 'install 'install-guix.vim + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((nvimdir (string-append (assoc-ref outputs "out") "/share/nvim"))) + (mkdir-p nvimdir) + (copy-file (assoc-ref inputs "guix.vim") + (string-append nvimdir "/sysinit.vim")))))))) + (native-search-paths + (list (search-path-specification + (variable "GUIX_VIMRUNTIME") + (separator ",") + (files (list "share/vim/vimfiles"))))) (inputs `(("libuv" ,libuv) ("msgpack" ,msgpack) @@ -730,7 +741,8 @@ (define-public neovim (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("gperf" ,gperf))) + ("gperf" ,gperf) + ("guix.vim" ,(search-auxiliary-file "guix.vim")))) (home-page "https://neovim.io") (synopsis "Fork of vim focused on extensibility and agility") (description "Neovim is a project that seeks to aggressively