guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

10/10: build-system/meson: Add #:substitutable? argument to build system


From: guix-commits
Subject: 10/10: build-system/meson: Add #:substitutable? argument to build system.
Date: Sat, 25 Nov 2023 10:33:29 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 13bc0633e77c73389e530a4c45e2de5a823f106b
Author: Skyler Ferris <skyvine@protonmail.com>
AuthorDate: Sun Nov 19 09:14:39 2023 -0800

    build-system/meson: Add #:substitutable? argument to build system.
    
    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
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/build-system/meson.scm | 2 ++
 1 file changed, 2 insertions(+)

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 @@ TRIPLET."
                       (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 @@ has a 'meson.build' file."
                             (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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]