From 0a10abf73e7bb1d5f751229c709903a0f66574d2 Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Wed, 6 Mar 2019 21:51:57 +0100 Subject: gnu: neovim: Fix #34616. This fixes a segmentation fault in neovim, where an error return value is passed in as a pointer. * gnu/packages/vim.scm (neovim)[arguments](phases): Add 'patch-tic phase. --- gnu/packages/vim.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 5e1e9b852c..a6f4395f53 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -693,6 +693,12 @@ are detected, the user is notified."))) #:configure-flags '("-DPREFER_LUA:BOOL=YES") #:phases (modify-phases %standard-phases + ;; TODO: remove 'patch-tic on update + ;; see: https://github.com/neovim/neovim/issues/9687 + (add-after 'unpack 'patch-tic + (lambda _ + (substitute* "src/nvim/tui/tui.c" + (("value != NULL") "value != NULL && value != (char *)-1")))) (add-after 'unpack 'set-lua-paths (lambda* (#:key inputs #:allow-other-keys) (let* ((lua-version "5.2") -- cgit 1.4.1 From 3189fad217e257fb9bef3e632a3f7b36ae05748a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 7 Mar 2019 13:39:45 +0100 Subject: gnu: neovim: Let build phase return #T. * gnu/packages/vim.scm (neovim)[arguments]: Return #T from "patch-tic" phase. --- gnu/packages/vim.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/vim.scm') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index a6f4395f53..6a98f0a5a4 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -698,7 +698,8 @@ are detected, the user is notified."))) (add-after 'unpack 'patch-tic (lambda _ (substitute* "src/nvim/tui/tui.c" - (("value != NULL") "value != NULL && value != (char *)-1")))) + (("value != NULL") "value != NULL && value != (char *)-1")) + #t)) (add-after 'unpack 'set-lua-paths (lambda* (#:key inputs #:allow-other-keys) (let* ((lua-version "5.2") -- cgit 1.4.1