[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68315] [PATCH 05/48] build-system: android-ndk: Redefine gnu-build.
From: |
Nicolas Graves |
Subject: |
[bug#68315] [PATCH 05/48] build-system: android-ndk: Redefine gnu-build. |
Date: |
Mon, 8 Jan 2024 09:02:37 +0100 |
* guix/build-system/android-ndk.scm
(android-ndk-build): Monadic procedure returns a gexp instead of a derivation.
Change-Id: If1737d77ebccd418ad461c91aff170273855ed45
---
guix/build-system/android-ndk.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/guix/build-system/android-ndk.scm
b/guix/build-system/android-ndk.scm
index aa7cc06279..cee5d6674d 100644
--- a/guix/build-system/android-ndk.scm
+++ b/guix/build-system/android-ndk.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -73,11 +74,8 @@ (define builder
search-paths))
#:inputs #$(input-tuples->gexp inputs)))))
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
- system #:graft? #f)))
- (gexp->derivation name builder
- #:system system
- #:guile-for-build guile)))
+ (mbegin %store-monad
+ (return builder)))
(define* (lower name
#:key source inputs native-inputs outputs system target
--
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 <=
- [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, 2024/01/08
- [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