* guix/build-system/meson.scm
(meson-build): Monadic procedure returns a gexp instead of a derivation.
(meson-cross-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: Id801e757463080dbeedc05a43bd0b2ae23fae4c7
---
guix/build-system/meson.scm | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
@@ -4,6 +4,7 @@
;;; Copyright © 2021-2022, 2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -254,16 +255,8 @@ (define build-phases
#:strip-directories #$strip-directories
#:elf-directories #$(sexp->gexp elf-directories))))))
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f)))
- (gexp->derivation name builder
- #:system system
- #:target #f
- #:graft? #f
- #:substitutable? substitutable?
- #:allowed-references allowed-references
- #:disallowed-references disallowed-references
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
(define* (meson-cross-build name
#:key
@@ -370,16 +363,8 @@ (define build-phases
#:strip-directories #$strip-directories
#:elf-directories #$(sexp->gexp elf-directories)))))
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f)))
- (gexp->derivation name builder
- #:system system
- #:target target
- #:graft? #f
- #:substitutable? substitutable?
- #:allowed-references allowed-references
- #:disallowed-references disallowed-references
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
(define meson-build-system
(build-system