From c43077076f2e172ca89231affcfdf2dfaae0f351 Mon Sep 17 00:00:00 2001 From: Skyler Ferris Date: Sun, 19 Nov 2023 09:10:36 -0800 Subject: build-system/guile: Add #:substitutable? argument to build system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is implemented the same as in gnu-build-system. * guix/build-system/guile.scm (guile-build, guile-cross-build): Add #:substitutable? argument Change-Id: I04babb81ff1f322833f7ff22cd7580c048b26102 Signed-off-by: Ludovic Courtès --- guix/build-system/guile.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'guix/build-system') diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 1bd292e267..bd3bb1c870 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -88,7 +88,8 @@ (compile-flags %compile-flags) (imported-modules %guile-build-system-modules) (modules '((guix build guile-build-system) - (guix build utils)))) + (guix build utils))) + (substitutable? #t)) "Build SOURCE using Guile taken from the native inputs, and with INPUTS." (define builder (with-imported-modules imported-modules @@ -114,6 +115,7 @@ #:system system #:target #f #:graft? #f + #:substitutable? substitutable? #:guile-for-build guile))) (define* (guile-cross-build name @@ -133,7 +135,8 @@ (compile-flags %compile-flags) (imported-modules %guile-build-system-modules) (modules '((guix build guile-build-system) - (guix build utils)))) + (guix build utils))) + (substitutable? #t)) (define builder (with-imported-modules imported-modules #~(begin @@ -173,6 +176,7 @@ #:system system #:target target #:graft? #f + #:substitutable? substitutable? #:guile-for-build guile))) (define guile-build-system -- cgit v1.2.3 From 13bc0633e77c73389e530a4c45e2de5a823f106b Mon Sep 17 00:00:00 2001 From: Skyler Ferris Date: Sun, 19 Nov 2023 09:14:39 -0800 Subject: build-system/meson: Add #:substitutable? argument to build system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- guix/build-system/meson.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'guix/build-system') 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 -- cgit v1.2.3 From 25b9d6c1498db6f374180e1179f25be284921943 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 Nov 2023 09:51:29 +0200 Subject: build-system/vim: Add missing keywords. * guix/build-system/vim.scm (vim-build): Add missing build-system flags. Change-Id: Ie0094bb0579987e8432750f883eb56bae8ccd845 --- guix/build-system/vim.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'guix/build-system') diff --git a/guix/build-system/vim.scm b/guix/build-system/vim.scm index fa874a1e3d..dddf7ea14b 100644 --- a/guix/build-system/vim.scm +++ b/guix/build-system/vim.scm @@ -106,6 +106,13 @@ (install-plan ''()) (phases '(@ (guix build vim-build-system) %standard-phases)) (outputs '("out")) + (out-of-source? #t) + (tests? #t) + (validate-runpath? #t) + (patch-shebangs? #t) + (strip-binaries? #t) + (strip-flags %strip-flags) + (strip-directories %strip-directories) (search-paths '()) (system (%current-system)) (substitutable? #t) @@ -135,8 +142,14 @@ #:search-paths '#$(sexp->gexp (map search-path-specification->sexp search-paths)) - #:inputs - %build-inputs))))) + #:inputs %build-inputs + #:out-of-source? #$out-of-source? + #:tests? #$tests? + #:validate-runpath? #$validate-runpath? + #:patch-shebangs? #$patch-shebangs? + #:strip-binaries? #$strip-binaries? + #:strip-flags #$strip-flags + #:strip-directories #$strip-directories))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) -- cgit v1.2.3