From 8c870ee4476d71ad2053ec94da5f0c67cc01bef1 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Thu, 25 May 2023 15:31:05 +0200 Subject: [PATCH] Patch nimlangserver to work around missing /usr/compiler/pathutils --- .gitignore | 1 + PKGBUILD | 16 ++++++++++++---- nimlangserver.patch | 12 ++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 nimlangserver.patch diff --git a/.gitignore b/.gitignore index 65dee26..21c9591 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.zst /nimlangserver/ /src/ +/pkg/ diff --git a/PKGBUILD b/PKGBUILD index 2647d64..36e8fb2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,12 +8,19 @@ arch=('x86_64') url="https://github.com/nim-lang/langserver" license=('MIT') depends=('nim>=1.0.0') -makedepends=('git') # pathutils to makedepends -# FIXME Blocker with missing pathutil library of nim (https://github.com/nim-lang/langserver/issues/22) +makedepends=('git') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") -source=("${pkgname%-git}::git+$url.git") -sha256sums=('SKIP') +source=("${pkgname%-git}::git+$url.git" + "nimlangserver.patch") +sha256sums=('SKIP' + '76a987077dea6a224a6337a08f172f92da1734af6c7e31e8674d131654aba07c') + +prepare() { + # patching + cd "$srcdir/${pkgname%-git}" + patch --strip=2 < ../../nimlangserver.patch # work around "Error: cannot open file: /usr/compiler/pathutils" https://github.com/nim-lang/langserver/issues/22 +} pkgver() { cd "$srcdir/${pkgname%-git}" @@ -21,6 +28,7 @@ pkgver() { } build() { + # FIXME missing "packages.json" file # change into source cd "$srcdir/${pkgname%-git}" # compile program diff --git a/nimlangserver.patch b/nimlangserver.patch new file mode 100644 index 0000000..f44f9a5 --- /dev/null +++ b/nimlangserver.patch @@ -0,0 +1,12 @@ +diff '--color=auto' --unified --recursive --text --color src/nimlangserver-orig/nimlangserver.nim src/nimlangserver/nimlangserver.nim +--- src/nimlangserver-orig/nimlangserver.nim 2023-05-25 14:56:42.996481704 +0200 ++++ src/nimlangserver/nimlangserver.nim 2023-05-25 14:56:51.320521779 +0200 +@@ -2,7 +2,7 @@ + faststreams/asynctools_adapters, faststreams/inputs, faststreams/outputs, + json_rpc/streamconnection, os, sugar, sequtils, hashes, osproc, + suggestapi, protocol/enums, protocol/types, with, tables, strutils, sets, +- ./utils, ./pipes, chronicles, std/re, uri, "$nim/compiler/pathutils" ++ ./utils, ./pipes, chronicles, std/re, uri, "$lib/compiler/pathutils" + + const + RESTART_COMMAND = "nimlangserver.restart"