From patchwork Mon Mar 14 21:56:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 37798 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 2BF3327BBEA; Mon, 14 Mar 2022 21:57:19 +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 E234027BBE9 for ; Mon, 14 Mar 2022 21:57:18 +0000 (GMT) Received: from localhost ([::1]:34532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTsgo-0007Da-5B for patchwork@mira.cbaines.net; Mon, 14 Mar 2022 17:57:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTsgY-0007Bv-Vo for guix-patches@gnu.org; Mon, 14 Mar 2022 17:57:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTsgY-0002J0-NC for guix-patches@gnu.org; Mon, 14 Mar 2022 17:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nTsgY-0003Di-MG for guix-patches@gnu.org; Mon, 14 Mar 2022 17:57:02 -0400 X-Loop: help-debbugs@gnu.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. References: <20220312210940.15397-1-paren@disroot.org> In-Reply-To: <20220312210940.15397-1-paren@disroot.org> Resent-From: "(unmatched-parenthesis" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Mar 2022 21:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54357 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54357@debbugs.gnu.org Cc: "\(unmatched-parenthesis" Received: via spool by 54357-submit@debbugs.gnu.org id=B54357.164729501612341 (code B ref 54357); Mon, 14 Mar 2022 21:57:02 +0000 Received: (at 54357) by debbugs.gnu.org; 14 Mar 2022 21:56:56 +0000 Received: from localhost ([127.0.0.1]:46665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTsgS-0003Cy-I3 for submit@debbugs.gnu.org; Mon, 14 Mar 2022 17:56:56 -0400 Received: from knopi.disroot.org ([178.21.23.139]:56826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTsgP-0003Cm-Pq for 54357@debbugs.gnu.org; Mon, 14 Mar 2022 17:56:55 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3D67540093; Mon, 14 Mar 2022 22:56:52 +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 j7LTm4Bwq2Qa; Mon, 14 Mar 2022 22:56:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1647295011; bh=UV4PQjkvI0HFgHs8geL6kSpT7xZiuo3b8V8PPk3ZWUg=; h=From:To:Cc:Subject:Date; b=I9cA7VdpxkbNfXsNPCBCtmDl12k7We/jwZAlmklaAQoG0S5x0hlMBok6iRG2nkj3Z w67e4dCZDFwKb4pWOT35g8DdrY6Ia3AOECgt9Hbf2/kXBwxM1UKPGewMqpCP4p8lC7 93U+nYT8SivKD/p7B8GkFsTLQFfOa6FW73dVMOQbgTSnbCpabVIbeZTVjV38v/WnMC 52/V3XAAZjyvdI+kq8blWo/NZqYHyv2jAX+Tf4uWrhySLbJvCHQnDYtH7jIgnV8X05 jwEPkXktAz8OLnIEbiySQktTncIGWpEq/g3DVoouV08cM1qI6Kp/TO3q9DHOPahxA8 6ybndXOq+ZOlw== Date: Mon, 14 Mar 2022 21:56:37 +0000 Message-Id: <20220314215640.22822-1-paren@disroot.org> 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: "\(unmatched-parenthesis" X-ACL-Warn: , "\(unmatched-parenthesis via Guix-patches" X-Patchwork-Original-From: "\(unmatched-parenthesis via Guix-patches" via From: "\\(" X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2021 Pierre Langlois ;;; Copyright © 2021 Calum Irwin +;;; Copyright © 2022 (unmatched parenthesis ;;; ;;; 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