amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system: ruby: Improve ruby-cross-build style.

Browse source 
* guix/build-system/ruby.scm
(ruby-cross-build): Use with-imported-modules around the
ruby-cross-build builder gexp.

Change-Id: I1051124f034f2082ccef531e9bcf37913d5a9449
Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Nicolas Graves 2025-04-25 11:26:33 +02:00 • committed by Christopher Baines
parent 9092b1f59b
commit 97a25bb484
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
guix/build-system/ruby.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 David Thompson <davet@gnu.org> ;;; Copyright © 2014 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2015, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -88,24 +89,25 @@ NAME and VERSION."
(guix build utils)))) (guix build utils))))
"Build SOURCE using RUBY and INPUTS." "Build SOURCE using RUBY and INPUTS."
(define build (define build
#~(begin (with-imported-modules imported-modules
(use-modules #$@(sexp->gexp modules)) #~(begin
(use-modules #$@(sexp->gexp modules))
#$(with-build-variables inputs outputs #$(with-build-variables inputs outputs
#~(ruby-build #:name #$name #~(ruby-build #:name #$name
#:source #+source #:source #+source
#:system #$system #:system #$system
#:gem-flags #$gem-flags #:gem-flags #$gem-flags
#:test-target #$test-target #:test-target #$test-target
#:tests? #$tests? #:tests? #$tests?
#:phases #$(if (pair? phases) #:phases #$(if (pair? phases)
(sexp->gexp phases) (sexp->gexp phases)
phases) phases)
#:outputs %outputs #:outputs %outputs
#:search-paths '#$(sexp->gexp #:search-paths '#$(sexp->gexp
(map search-path-specification->sexp (map search-path-specification->sexp
search-paths)) search-paths))
#:inputs %build-inputs)))) #:inputs %build-inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f))) system #:graft? #f)))
@ -113,7 +115,6 @@ NAME and VERSION."
#:system system #:system system
#:target #f #:target #f
#:graft? #f #:graft? #f
#:modules imported-modules
#:guile-for-build guile))) #:guile-for-build guile)))
(define ruby-build-system (define ruby-build-system