unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "\(unmatched-parenthesis via Guix-patches" via <guix-patches@gnu.org>
To: 54357@debbugs.gnu.org
Cc: "\(unmatched-parenthesis" <paren@disroot.org>
Subject: [bug#54357] [PATCH 1/4] gnu: kakoune: Clean up, and add a search path that makes it possible to package kak plugins in guix.
Date: Mon, 14 Mar 2022 21:56:37 +0000	[thread overview]
Message-ID: <20220314215640.22822-1-paren@disroot.org> (raw)
In-Reply-To: <20220312210940.15397-1-paren@disroot.org>

* gnu/packages/text-editors.scm(kakoune): Clean up package recipe, and add GUIX_KAKOUNE_DIRS search path.

Okay, I overengineered this... This patch set should definitely work. Promise.
---
 gnu/packages/text-editors.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 45cc61765a..aff8bab9b0 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2021 Calum Irwin <calumirwin1@gmail.com>
+;;; Copyright © 2022 (unmatched parenthesis <paren@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -41,6 +42,7 @@ (define-module (gnu packages text-editors)
   #:use-module (guix utils)
   #:use-module (guix build-system cargo)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system python)
@@ -187,14 +189,17 @@ (define-public kakoune
              (substitute* "src/shell_manager.cc"
                (("if \\(m_shell.empty\\(\\)\\)" line)
                 (string-append "m_shell = \"" (which "sh")
-                               "\";\n        " line)))
-             #t))
+                               "\";\n        " line)))))
          (delete 'configure)            ; no configure script
          ;; kakoune requires us to be in the src/ directory to build.
          (add-before 'build 'chdir
-           (lambda _ (chdir "src") #t)))))
+           (lambda _ (chdir "src"))))))
     (native-inputs
      (list asciidoc pkg-config ruby))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "KAKOUNE_RUNTIME")
+            (files '("share/kak")))))
     (synopsis "Vim-inspired code editor")
     (description
      "Kakoune is a code editor heavily inspired by Vim, as such most of its
-- 
2.34.0





  parent reply	other threads:[~2022-03-14 21:57 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <d119bec222e729f592d4d79f8e9c3a92@disroot.org>
2022-03-12 21:09 ` [bug#54357] [PATCH] gnu: kakoune: Clean up, and add a search path that makes it possible to package kak plugins in guix. (Plugins incoming soon.) (unmatched-parenthesis via Guix-patches via
2022-03-12 22:33   ` paren--- via Guix-patches via
2022-03-12 22:40   ` [bug#54357] [PATCH] gnu: Add kak-auto-pairs (unmatched-parenthesis via Guix-patches via
2022-03-12 23:20   ` [bug#54357] [PATCH] gnu: Add kak-sudo-write (unmatched-parenthesis via Guix-patches via
2022-03-13 22:16   ` [bug#54357] [PATCH 1/4] gnu: kakoune: Clean up, and add a search path that makes it possible to package kak plugins in guix (unmatched-parenthesis via Guix-patches via
2022-03-13 22:16     ` [bug#54357] [PATCH 2/4] gnu: rust-parinfer: add phases to install the bundled Vim and Kakoune plugins (unmatched-parenthesis via Guix-patches via
2022-03-13 22:16     ` [bug#54357] [PATCH 3/4] gnu: Add kak-auto-pairs (unmatched-parenthesis via Guix-patches via
2022-03-13 22:16     ` [bug#54357] [PATCH 4/4] gnu: Add kak-sudo-write (unmatched-parenthesis via Guix-patches via
2022-03-14 21:56   ` (unmatched-parenthesis via Guix-patches via [this message]
2022-03-14 21:56     ` [bug#54357] [PATCH 2/4] gnu: rust-parinfer: add phases to install the bundled Vim and Kakoune plugins (unmatched-parenthesis via Guix-patches via
2022-03-14 21:56     ` [bug#54357] [PATCH 3/4] gnu: Add kak-auto-pairs (unmatched-parenthesis via Guix-patches via
2022-03-14 21:56     ` [bug#54357] [PATCH 4/4] gnu: Add kak-sudo-write (unmatched-parenthesis via Guix-patches via
2022-06-04  8:23   ` [bug#54357] Calum Irwin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220314215640.22822-1-paren@disroot.org \
    --to=guix-patches@gnu.org \
    --cc=54357@debbugs.gnu.org \
    --cc=paren@disroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).