.
This commit is contained in:
parent
069f0ba04a
commit
d25b380f76
2 changed files with 7 additions and 23 deletions
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
|
||||
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
|
||||
;;; Copyright © 2024 Daniel Ziltener <dziltener@lyrion.ch>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -43,7 +44,7 @@ EXTENSION is the file name extension, such as '.tar.gz'."
|
|||
|
||||
(define %chicken-build-system-modules
|
||||
;; Build-side modules imported and used by default.
|
||||
`((zilti build chicken-build-system)
|
||||
`((guix build chicken-build-system)
|
||||
(guix build union)
|
||||
,@%gnu-build-system-modules))
|
||||
|
||||
|
@ -113,25 +114,7 @@ EXTENSION is the file name extension, such as '.tar.gz'."
|
|||
(guix build utils))))
|
||||
(define builder
|
||||
(with-imported-modules imported-modules
|
||||
#~(begin
|
||||
(use-modules #$@(sexp->gexp modules))
|
||||
#$(with-build-variables inputs outputs
|
||||
#~(chicken-build #:name #$name
|
||||
#:source #+source
|
||||
#:system #$system
|
||||
#:phases #$phases
|
||||
#:configure-flags #$configure-flags
|
||||
#:extra-directories #$extra-directories
|
||||
#:parallel-build? #$parallel-build?
|
||||
#:outputs #$(outputs->gexp outputs)
|
||||
#:search-paths '#$(sexp->gexp
|
||||
(map search-path-specification->sexp
|
||||
search-paths))
|
||||
#:egg-name #$egg-name
|
||||
#:unpack-path #$unpack-path
|
||||
#:build-flags #$build-flags
|
||||
#:tests? #$tests?
|
||||
#:inputs #$(input-tuples->gexp inputs))))))
|
||||
#~(use-modules #$@(sexp->gexp modules))))
|
||||
|
||||
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
|
||||
system #:graft? #f)))
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
|
||||
;;; Copyright © 2024 Daniel Ziltener <dziltener@lyrion.ch>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -56,9 +57,9 @@
|
|||
(define* (unpack #:key source egg-name unpack-path #:allow-other-keys)
|
||||
"Relative to $CHICKEN_EGG_CACHE, unpack SOURCE in UNPACK-PATH, or EGG-NAME
|
||||
when UNPACK-PATH is unset. If the SOURCE archive has a single top level
|
||||
directory, it is stripped so that the sources appear directly under UNPACK-PATH.
|
||||
When SOURCE is a directory, copy its content into UNPACK-PATH instead of
|
||||
unpacking."
|
||||
directory, it is stripped so that the sources appear directly under
|
||||
UNPACK-PATH. When SOURCE is a directory, copy its content into UNPACK-PATH
|
||||
instead of unpacking."
|
||||
(define (unpack-maybe-strip source dest)
|
||||
(let* ((scratch-dir (string-append (or (getenv "TMPDIR") "/tmp")
|
||||
"/scratch-dir"))
|
||||
|
|
Loading…
Reference in a new issue