diff mbox series

[bug#67284] guix: meson: Add #:substitutable? argument to build system.

Message ID 1650b790f2eca0a74736230b570d1299e5bcfc8b.1700414069.git.skyvine@protonmail.com
State New
Headers
Series [bug#67284] guix: meson: Add #:substitutable? argument to build system. |

Commit Message

Skyler Ferris Nov. 19, 2023, 5:14 p.m. UTC 
This implemented the same as in gnu-build-system. The gexp->derivation
calls did not need to be modified because they already
passed #:substitutable?, which did not cause an error due to the
procedure exported by the (guix store) module with the same name.

* guix/build-system/meson.scm (meson-build, meson-cross-build): Add
  #:substitutable? argument

Change-Id: I2d56c8130f785a2d6af456ef9f9bfc1b10dc2a50
---
 guix/build-system/meson.scm | 2 ++
 1 file changed, 2 insertions(+)


base-commit: cd82ddd15c28b4f4690255b11a1ce6dcac7c166d

Comments

Ludovic Courtès Nov. 25, 2023, 4:31 p.m. UTC | #1 
Skyler Ferris <skyvine@protonmail.com> skribis:

> This implemented the same as in gnu-build-system. The gexp->derivation
> calls did not need to be modified because they already
> passed #:substitutable?, which did not cause an error due to the
> procedure exported by the (guix store) module with the same name.

Heh, fun.  :-)

> * guix/build-system/meson.scm (meson-build, meson-cross-build): Add
>   #:substitutable? argument
>
> Change-Id: I2d56c8130f785a2d6af456ef9f9bfc1b10dc2a50

Applied, thanks!
diff mbox series

Patch

diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index 7c617bffb0..2d14016b94 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -182,6 +182,7 @@  (define* (meson-build name inputs
                       (imported-modules %meson-build-system-modules)
                       (modules '((guix build meson-build-system)
                                  (guix build utils)))
+                      (substitutable? #t)
                       allowed-references
                       disallowed-references)
   "Build SOURCE using MESON, and with INPUTS, assuming that SOURCE
@@ -266,6 +267,7 @@  (define* (meson-cross-build name
                             (imported-modules %meson-build-system-modules)
                             (modules '((guix build meson-build-system)
                                        (guix build utils)))
+                            (substitutable? #t)
                             allowed-references
                             disallowed-references)
   "Cross-build SOURCE for TARGET using MESON, and with INPUTS, assuming that