guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: build-system: font: Move unpack utilities to build-inputs.


From: guix-commits
Subject: 03/03: build-system: font: Move unpack utilities to build-inputs.
Date: Mon, 16 May 2022 05:44:15 -0400 (EDT)

arunisaac pushed a commit to branch core-updates
in repository guix.

commit c18d7689698ac24cbd2974680638fcec513dd3a3
Author: Arun Isaac <arunisaac@systemreboot.net>
AuthorDate: Mon Mar 21 16:30:07 2022 +0530

    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.
---
 guix/build-system/font.scm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm
index 74dc80b5db..c43fb9a542 100644
--- a/guix/build-system/font.scm
+++ b/guix/build-system/font.scm
@@ -1,5 +1,5 @@
 ;;; 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.
 ;;;
@@ -54,20 +54,20 @@
   (bag
     (name name)
     (system system)
-    (host-inputs `(,@(if source
-                         `(("source" ,source))
-                         '())
-                   ,@inputs
-                   ,(list "tar" (module-ref (resolve-interface '(gnu packages 
base)) 'tar))
-                   ,@(let ((compression (resolve-interface '(gnu packages 
compression))))
-                       (map (match-lambda
-                              ((name package)
-                               (list name (module-ref compression package))))
-                            `(("gzip" gzip)
-                              ("bzip2" bzip2)
-                              ("unzip" unzip)
-                              ("xz" xz))))))
-    (build-inputs native-inputs)
+    (host-inputs inputs)
+    (build-inputs `(,@(if source
+                          `(("source" ,source))
+                          '())
+                    ,@native-inputs
+                    ,(list "tar" (module-ref (resolve-interface '(gnu packages 
base)) 'tar))
+                    ,@(let ((compression (resolve-interface '(gnu packages 
compression))))
+                        (map (match-lambda
+                               ((name package)
+                                (list name (module-ref compression package))))
+                             `(("gzip" gzip)
+                               ("bzip2" bzip2)
+                               ("unzip" unzip)
+                               ("xz" xz))))))
     (outputs outputs)
     (build font-build)
     (arguments (strip-keyword-arguments private-keywords arguments))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]