Merge pull request #217658 from poweredbypie/kak-lsp-14.2.0
kak-lsp: Fix missing Perl dependency
This commit is contained in:
commit
ec9940bc4f
|
@ -14668,6 +14668,11 @@
|
||||||
githubId = 146413;
|
githubId = 146413;
|
||||||
name = "Tobias Poschwatta";
|
name = "Tobias Poschwatta";
|
||||||
};
|
};
|
||||||
|
poweredbypie = {
|
||||||
|
name = "poweredbypie";
|
||||||
|
github = "poweredbypie";
|
||||||
|
githubId = 67135060;
|
||||||
|
};
|
||||||
PowerUser64 = {
|
PowerUser64 = {
|
||||||
email = "blakelysnorth@gmail.com";
|
email = "blakelysnorth@gmail.com";
|
||||||
github = "PowerUser64";
|
github = "PowerUser64";
|
||||||
|
|
37
pkgs/tools/misc/kak-lsp/0001-Use-full-Perl-path.patch
Normal file
37
pkgs/tools/misc/kak-lsp/0001-Use-full-Perl-path.patch
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
From b93660cfa8a80a5e5bf72e1f06fb7bf95272c7e4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: PoweredByPie <poweredbypie@users.noreply.github.com>
|
||||||
|
Date: Fri, 8 Dec 2023 04:39:01 -0800
|
||||||
|
Subject: [PATCH] Use full Perl path
|
||||||
|
|
||||||
|
---
|
||||||
|
rc/lsp.kak | 7 +------
|
||||||
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/rc/lsp.kak b/rc/lsp.kak
|
||||||
|
index d695a2e..7c6a436 100644
|
||||||
|
--- a/rc/lsp.kak
|
||||||
|
+++ b/rc/lsp.kak
|
||||||
|
@@ -2339,11 +2339,6 @@ define-command -hidden lsp-snippets-insert-completion -params 1 %{ evaluate-comm
|
||||||
|
}}
|
||||||
|
|
||||||
|
define-command lsp-snippets-insert -hidden -params 1 %[
|
||||||
|
- evaluate-commands %sh{
|
||||||
|
- if ! command -v perl > /dev/null 2>&1; then
|
||||||
|
- printf "fail '''perl'' must be installed to use the ''snippets-insert'' command'"
|
||||||
|
- fi
|
||||||
|
- }
|
||||||
|
evaluate-commands -draft -save-regs '^"' %[
|
||||||
|
set-register '"' %arg{1}
|
||||||
|
execute-keys <a-P>
|
||||||
|
@@ -2397,7 +2392,7 @@ define-command lsp-snippets-insert -hidden -params 1 %[
|
||||||
|
|
||||||
|
define-command -hidden lsp-snippets-insert-perl-impl %[
|
||||||
|
evaluate-commands %sh[ # $kak_quoted_selections
|
||||||
|
- perl -e '
|
||||||
|
+ @perlPath@/bin/perl -e '
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
use Text::ParseWords();
|
||||||
|
--
|
||||||
|
2.42.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, rustPlatform, CoreServices, Security, SystemConfiguration }:
|
{ stdenv, lib, fetchFromGitHub, rustPlatform, perl, CoreServices, Security, SystemConfiguration }:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "kak-lsp";
|
pname = "kak-lsp";
|
||||||
|
@ -13,13 +13,20 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
cargoHash = "sha256-+3cpAL+8X8L833kmZapUoGSwHOj+hnDN6oDNJZ6y24Q=";
|
cargoHash = "sha256-+3cpAL+8X8L833kmZapUoGSwHOj+hnDN6oDNJZ6y24Q=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
|
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
|
||||||
|
|
||||||
|
patches = [ ./0001-Use-full-Perl-path.patch ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace rc/lsp.kak \
|
||||||
|
--subst-var-by perlPath ${lib.getBin perl}
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Kakoune Language Server Protocol Client";
|
description = "Kakoune Language Server Protocol Client";
|
||||||
homepage = "https://github.com/kak-lsp/kak-lsp";
|
homepage = "https://github.com/kak-lsp/kak-lsp";
|
||||||
license = with licenses; [ unlicense /* or */ mit ];
|
license = with licenses; [ unlicense /* or */ mit ];
|
||||||
maintainers = [ maintainers.spacekookie ];
|
maintainers = with maintainers; [ spacekookie poweredbypie ];
|
||||||
mainProgram = "kak-lsp";
|
mainProgram = "kak-lsp";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user