zilti/guixchannel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

.

Browse source
This commit is contained in:
Daniel Ziltener 2024-03-07 22:46:21 +01:00
parent 069f0ba04a
commit d25b380f76
Signed by: zilti
GPG key ID: B38976E82C9DAE42
2 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
zilti/build-system/chicken.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2020 raingloom <raingloom@riseup.net> ;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2024 Daniel Ziltener <dziltener@lyrion.ch>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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 (define %chicken-build-system-modules
;; Build-side modules imported and used by default. ;; Build-side modules imported and used by default.
`((zilti build chicken-build-system) `((guix build chicken-build-system)
(guix build union) (guix build union)
,@%gnu-build-system-modules)) ,@%gnu-build-system-modules))
@ -113,25 +114,7 @@ EXTENSION is the file name extension, such as '.tar.gz'."
(guix build utils)))) (guix build utils))))
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(use-modules #$@(sexp->gexp modules))))
(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))))))
(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)))

7
zilti/build/chicken-build-system.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 raingloom <raingloom@riseup.net> ;;; Copyright © 2020 raingloom <raingloom@riseup.net>
;;; Copyright © 2024 Daniel Ziltener <dziltener@lyrion.ch>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -56,9 +57,9 @@
(define* (unpack #:key source egg-name unpack-path #:allow-other-keys) (define* (unpack #:key source egg-name unpack-path #:allow-other-keys)
"Relative to $CHICKEN_EGG_CACHE, unpack SOURCE in UNPACK-PATH, or EGG-NAME "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 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. directory, it is stripped so that the sources appear directly under
When SOURCE is a directory, copy its content into UNPACK-PATH instead of UNPACK-PATH. When SOURCE is a directory, copy its content into UNPACK-PATH
unpacking." instead of unpacking."
(define (unpack-maybe-strip source dest) (define (unpack-maybe-strip source dest)
(let* ((scratch-dir (string-append (or (getenv "TMPDIR") "/tmp") (let* ((scratch-dir (string-append (or (getenv "TMPDIR") "/tmp")
"/scratch-dir")) "/scratch-dir"))