nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Add glibc-utf8-locales to the implicit inputs. 

Suggested by Mark H Weaver and Andreas Enge
at <http://lists.gnu.org/archive/html/guix-devel/2015-02/msg00356.html>.

* gnu/packages/commencement.scm (gzip-final, glibc-utf8-locales-final):
  New variables.
  (%final-inputs): Use them.
This commit is contained in:
Ludovic Courtès 2015-02-26 23:39:47 +01:00
parent 5335c56e8e
commit b0fd2bd3c5
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/commencement.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
@ -662,6 +662,16 @@ store.")
("grep" ,grep-final) ("grep" ,grep-final)
,@%boot4-inputs)) ,@%boot4-inputs))
(define gzip-final
(package-with-explicit-inputs gzip %boot5-inputs
(current-source-location)))
(define glibc-utf8-locales-final
(package
(inherit glibc-utf8-locales)
(inputs `(("glibc" ,glibc-final)
("gzip" ,gzip-final)))))
(define-public %final-inputs (define-public %final-inputs
;; Final derivations used as implicit inputs by 'gnu-build-system'. We ;; Final derivations used as implicit inputs by 'gnu-build-system'. We
;; still use 'package-with-bootstrap-guile' so that the bootstrap tools are ;; still use 'package-with-bootstrap-guile' so that the bootstrap tools are
@ -674,7 +684,6 @@ store.")
((name package) ((name package)
(list name (finalize package)))) (list name (finalize package))))
`(("tar" ,tar) `(("tar" ,tar)
("gzip" ,gzip)
("bzip2" ,bzip2) ("bzip2" ,bzip2)
("xz" ,xz) ("xz" ,xz)
("file" ,file) ("file" ,file)
@ -683,6 +692,7 @@ store.")
("sed" ,sed) ("sed" ,sed)
("findutils" ,findutils) ("findutils" ,findutils)
("gawk" ,gawk))) ("gawk" ,gawk)))
("gzip" ,gzip-final)
("grep" ,grep-final) ("grep" ,grep-final)
("coreutils" ,coreutils-final) ("coreutils" ,coreutils-final)
("make" ,gnu-make-final) ("make" ,gnu-make-final)
@ -690,7 +700,8 @@ store.")
("ld-wrapper" ,ld-wrapper) ("ld-wrapper" ,ld-wrapper)
("binutils" ,binutils-final) ("binutils" ,binutils-final)
("gcc" ,gcc-final) ("gcc" ,gcc-final)
("libc" ,glibc-final)))) ("libc" ,glibc-final)
("locales" ,glibc-utf8-locales-final))))
(define-public canonical-package (define-public canonical-package
(let ((name->package (fold (lambda (input result) (let ((name->package (fold (lambda (input result)