[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68315] [PATCH 45/48] build-system: vim: Redefine vim-build.
From: |
Nicolas Graves |
Subject: |
[bug#68315] [PATCH 45/48] build-system: vim: Redefine vim-build. |
Date: |
Mon, 8 Jan 2024 09:03:17 +0100 |
* guix/build-system/vim.scm
(vim-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: Iedbb15faac445f169cffa16397b357bc4f15c0f6
---
guix/build-system/vim.scm | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/guix/build-system/vim.scm b/guix/build-system/vim.scm
index dddf7ea14b..22c38aefca 100644
--- a/guix/build-system/vim.scm
+++ b/guix/build-system/vim.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 Jonathan Scoresby <me@jonscoresby.com>
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -120,7 +121,7 @@ (define* (vim-build name inputs
(modules '((guix build vim-build-system)
(guix build utils))))
- (define build
+ (define builder
(with-imported-modules imported-modules
#~(begin
(use-modules #$@modules)
@@ -151,16 +152,8 @@ (define build
#:strip-flags #$strip-flags
#:strip-directories #$strip-directories)))))
- (mlet %store-monad
- ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f)))
- (gexp->derivation name
- build
- #:system system
- #:target #f
- #:graft? #f
- #:substitutable? substitutable?
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
(define vim-build-system
(build-system (name 'vim)
--
2.41.0
- [bug#68315] [PATCH 27/48] build-system: meson: Redefine meson-build and meson-cross-build., (continued)
- [bug#68315] [PATCH 27/48] build-system: meson: Redefine meson-build and meson-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 36/48] build-system: r: Redefine r-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 35/48] build-system: qt: Redefine qt-build and qt-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 38/48] build-system: rebar: Redefine rebar-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 34/48] build-system: python: Redefine python-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 39/48] build-system: renpy: Redefine renpy-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 41/48] build-system: ruby: Redefine ruby-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 40/48] build-system: ruby: Improve ruby-cross-build style., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 46/48] build-system: waf: Improve waf-build style., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 43/48] build-system: texlive: Redefine texlive-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 45/48] build-system: vim: Redefine vim-build.,
Nicolas Graves <=
- [bug#68315] [PATCH 37/48] build-system: rakudo: Redefine rakudo-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 44/48] build-system: tree-sitter: Redefine tree-sitter-build functions., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 42/48] build-system: scons: Redefine scons-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 47/48] build-system: zig: Redefine zig-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 48/48] build-system: trivial: Redefine trivial-build functions., Nicolas Graves, 2024/01/08