ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 06:36:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: bootstrap-tarballs: Turn builder into a gexp.

Browse source 
* gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[arguments]: Turn
 #:builder into a gexp.
This commit is contained in:
Ludovic Courtès 2021-07-05 23:57:20 +02:00
parent 8740a62b6b
commit dbacdb8c03
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/make-bootstrap.scm
View file

@ -23,6 +23,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages make-bootstrap) (define-module (gnu packages make-bootstrap)
#:use-module (guix gexp)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix memoization) #:use-module (guix memoization)
@ -878,14 +879,14 @@ (define %bootstrap-tarballs
(source #f) (source #f)
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
`(#:modules ((guix build utils)) (list #:modules '((guix build utils))
#:builder #:builder
(begin #~(begin
(use-modules (guix build utils) (use-modules (guix build utils)
(ice-9 match) (ice-9 match)
(srfi srfi-26)) (srfi srfi-26))
(define out (assoc-ref %outputs "out")) (define out #$output)
(setvbuf (current-output-port) (setvbuf (current-output-port)
(cond-expand (guile-2.0 _IOLBF) (else 'line))) (cond-expand (guile-2.0 _IOLBF) (else 'line)))
@ -897,8 +898,7 @@ (define out (assoc-ref %outputs "out"))
(format #t "~a -> ~a~%" file out) (format #t "~a -> ~a~%" file out)
(symlink file (basename file))) (symlink file (basename file)))
(find-files directory "\\.tar\\.")))) (find-files directory "\\.tar\\."))))
%build-inputs) %build-inputs))))
#t)))
(inputs `(("guile-tarball" ,%guile-bootstrap-tarball) (inputs `(("guile-tarball" ,%guile-bootstrap-tarball)
,@(match (or (%current-target-system) (%current-system)) ,@(match (or (%current-target-system) (%current-system))
((or "i686-linux" "x86_64-linux") ((or "i686-linux" "x86_64-linux")