[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68315] [PATCH 08/48] build-system: cargo: Redefine cargo-build and
From: |
Nicolas Graves |
Subject: |
[bug#68315] [PATCH 08/48] build-system: cargo: Redefine cargo-build and cargo-cross-build. |
Date: |
Mon, 8 Jan 2024 09:02:40 +0100 |
* guix/build-system/cargo.scm
(cargo-build): Monadic procedure returns a gexp instead of a derivation.
(cargo-cross-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: If1151e9222170f2eb3a92d43debc61c696c2e72d
---
guix/build-system/cargo.scm | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index c029cc1dda..8576aeaf59 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -126,11 +127,8 @@ (define builder
(map search-path-specification->sexp
search-paths))))))
- (gexp->derivation name builder
- #:system system
- #:target #f
- #:graft? #f
- #:guile-for-build guile))
+ (mbegin %store-monad
+ (return builder)))
(define* (cargo-cross-build name
#:key
@@ -186,14 +184,11 @@ (define builder
(map search-path-specification->sexp
search-paths))
#:native-search-paths '#$(sexp->gexp
- (map search-path-specification->sexp
- native-search-paths))))))
+ (map
search-path-specification->sexp
+ native-search-paths))))))
- (gexp->derivation name builder
- #:system system
- #:target target
- #:graft? #f
- #:guile-for-build guile))
+ (mbegin %store-monad
+ (return builder)))
(define (package-cargo-inputs p)
(apply
--
2.41.0
- [bug#68315] [PATCH 00/48] Extend bag-build to gexps., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 01/48] guix: packages: Extend bag-build to support gexp., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 02/48] build-system: gnu: Improve gnu-cross-build style., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 03/48] build-system: gnu: Redefine gnu-build and gnu-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 04/48] build-system: agda: Redefine agda-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 05/48] build-system: android-ndk: Redefine gnu-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 07/48] build-system: asdf: Redefine asdf-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 08/48] build-system: cargo: Redefine cargo-build and cargo-cross-build.,
Nicolas Graves <=
- [bug#68315] [PATCH 09/48] build-system: chicken: Redefine chicken-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 06/48] build-system: ant: Redefine ant-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 12/48] build-system: composer: Redefine composer-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 11/48] build-system: cmake: Redefine cmake-build and cmake-cross-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 16/48] build-system: elm: Redefine elm-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 15/48] build-system: dune: Redefine dune-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 10/48] build-system: clojure: Redefine clojure-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 13/48] build-system: copy: Redefine copy-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 14/48] build-system: dub: Redefine dub-build., Nicolas Graves, 2024/01/08
- [bug#68315] [PATCH 19/48] build-system: glib-or-gtk: Improve glib-or-gtk-cross-build style., Nicolas Graves, 2024/01/08