mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-04 18:38:57 -05:00
build-system: font: Move unpack utilities to build-inputs.
* guix/build-system/font.scm (lower): Move tar, gzip, bzip2, unzip and xz from host-inputs to build-inputs.
This commit is contained in:
parent
3d0e92de09
commit
c18d768969
1 changed files with 15 additions and 15 deletions
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
;;; Copyright © 2017, 2022 Arun Isaac <arunisaac@systemreboot.net>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -54,20 +54,20 @@ (define private-keywords
|
||||||
(bag
|
(bag
|
||||||
(name name)
|
(name name)
|
||||||
(system system)
|
(system system)
|
||||||
(host-inputs `(,@(if source
|
(host-inputs inputs)
|
||||||
`(("source" ,source))
|
(build-inputs `(,@(if source
|
||||||
'())
|
`(("source" ,source))
|
||||||
,@inputs
|
'())
|
||||||
,(list "tar" (module-ref (resolve-interface '(gnu packages base)) 'tar))
|
,@native-inputs
|
||||||
,@(let ((compression (resolve-interface '(gnu packages compression))))
|
,(list "tar" (module-ref (resolve-interface '(gnu packages base)) 'tar))
|
||||||
(map (match-lambda
|
,@(let ((compression (resolve-interface '(gnu packages compression))))
|
||||||
((name package)
|
(map (match-lambda
|
||||||
(list name (module-ref compression package))))
|
((name package)
|
||||||
`(("gzip" gzip)
|
(list name (module-ref compression package))))
|
||||||
("bzip2" bzip2)
|
`(("gzip" gzip)
|
||||||
("unzip" unzip)
|
("bzip2" bzip2)
|
||||||
("xz" xz))))))
|
("unzip" unzip)
|
||||||
(build-inputs native-inputs)
|
("xz" xz))))))
|
||||||
(outputs outputs)
|
(outputs outputs)
|
||||||
(build font-build)
|
(build font-build)
|
||||||
(arguments (strip-keyword-arguments private-keywords arguments))))
|
(arguments (strip-keyword-arguments private-keywords arguments))))
|
||||||
|
|
Loading…
Reference in a new issue