diff options
author | Guillaume Le Vaillant <glv@posteo.net> | 2024-01-10 13:27:11 +0100 |
---|---|---|
committer | Guillaume Le Vaillant <glv@posteo.net> | 2024-01-10 14:04:40 +0100 |
commit | 749c3e016a4297d2794cbebac0e07297d19b4ffd (patch) | |
tree | 59b0c93bcaa9ad6d53fd73d2627231e5f0cf9320 /gnu/packages/vim.scm | |
parent | ea832b44b79fb06bac88679029773006fea15827 (diff) | |
parent | 537768018ee03a6a9a5562022a16b47ac287d131 (diff) |
Merge branch 'master' into lisp-team
Change-Id: I6c2ce53e782a00861c3adf01c2505099daef7728
Diffstat (limited to 'gnu/packages/vim.scm')
-rw-r--r-- | gnu/packages/vim.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 1f7a005cb1..e301088394 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -884,6 +884,14 @@ refactor Vim in order to: '(#:tests? #false ;no tests #:phases (modify-phases %standard-phases + (add-after 'unpack 'help-cmake-find-msgpack-c + (lambda _ + ;; Patch the build system so that it can find the modern + ;; 'msgpack-c' named pkg-config file (see: + ;; https://github.com/jeanguyomarch/eovim/issues/73). + (substitute* "cmake/Modules/FindMsgPack.cmake" + (("MSGPACK QUIET msgpack") + "MSGPACK QUIET msgpack-c msgpack")))) (add-after 'configure 'reference-nvim (lambda* (#:key inputs #:allow-other-keys) (let ((nvim (search-input-file inputs "/bin/nvim"))) @@ -894,10 +902,8 @@ refactor Vim in order to: (string-append start nvim)))))) (add-before 'build 'set-home (lambda _ (setenv "HOME" "/tmp")))))) - (native-inputs - (list pkg-config)) - (inputs - (list efl msgpack neovim)) + (native-inputs (list pkg-config)) + (inputs (list efl msgpack-c neovim)) (home-page "https://github.com/jeanguyomarch/eovim/") (synopsis "EFL GUI for Neovim") (description "Graphical Neovim interface based on the @acronym{EFL, Enlightenment |