diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
commit | 9dea3f101f252331c049c03f501398a5ec837ba9 (patch) | |
tree | 61d683a9fae3e147332d07fef207c1ddf51fc301 /gnu/packages/vim.scm | |
parent | 7f0af119a1e3ea9d0ae53811b619437b3e942702 (diff) | |
parent | 620669fd17306c2edb21c64a99fa47160fefb319 (diff) | |
download | guix-9dea3f101f252331c049c03f501398a5ec837ba9.tar.gz guix-9dea3f101f252331c049c03f501398a5ec837ba9.zip |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/cups.scm
gnu/packages/python-web.scm
gnu/packages/web.scm
guix/build/maven/pom.scm
Diffstat (limited to 'gnu/packages/vim.scm')
-rw-r--r-- | gnu/packages/vim.scm | 45 |
1 files changed, 44 insertions, 1 deletions
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 238c25d486..7a37162116 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2019 HiPhish <hiphish@posteo.de> ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2019, 2020 Jakub Kądziołka <kuba@kadziolka.net> -;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> +;;; Copyright © 2020, 2021 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2021 Tissevert <tissevert+guix@marvid.fr> ;;; @@ -43,6 +43,7 @@ #:use-module (gnu packages attr) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages enlightenment) #:use-module (gnu packages fontutils) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) @@ -746,6 +747,48 @@ refactor Vim in order to: ;; except for parts that were contributed under the Vim license. (license (list license:asl2.0 license:vim)))) +(define-public eovim + (package + (name "eovim") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jeanguyomarch/eovim/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06b7crmz3wvvq15ncl0jk20s8j1pmna2jin0k5y5n5qxpafbgp3k")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #false ;no tests + #:phases + (modify-phases %standard-phases + (add-after 'configure 'reference-nvim + (lambda* (#:key inputs #:allow-other-keys) + (let ((nvim (string-append (assoc-ref inputs "neovim") + "/bin/nvim"))) + ;; This substitution should change one line, and replaces the default + ;; value in the struct of options with an absolute store reference. + (substitute* "../source/src/main.c" + (("(^[[:blank:]]+\\.nvim = \")nvim" _ start) + (string-append start nvim)))))) + (add-before 'build 'set-home + (lambda _ (setenv "HOME" "/tmp")))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("efl" ,efl) + ("msgpack" ,msgpack) + ("neovim" ,neovim))) + (home-page "https://github.com/jeanguyomarch/eovim/") + (synopsis "EFL GUI for Neovim") + (description "Graphical Neovim interface based on the @acronym{EFL, Enlightenment +Foundation Libraries} toolkit. Its features include customizable appearance +and support for fonts with ligatures.") + (license license:expat))) + (define-public vifm (package (name "vifm") |