ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 21:59:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glibc-final: Add support for grafted glibc.

Browse source 
* gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)
(glibc-final): Use 'package/inherit'.
This commit is contained in:
Mark H Weaver 2017-06-24 01:34:47 -04:00
parent 56ed97c8b5
commit 13f7f2fd2b
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/commencement.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 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, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -467,7 +467,7 @@ (define glibc-final-with-bootstrap-bash
;; built just below; the only difference is that this one uses the ;; built just below; the only difference is that this one uses the
;; bootstrap Bash. ;; bootstrap Bash.
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package (inherit glibc) (package/inherit glibc
(name "glibc-intermediate") (name "glibc-intermediate")
(arguments (arguments
`(#:guile ,%bootstrap-guile `(#:guile ,%bootstrap-guile
@ -640,7 +640,7 @@ (define gettext-boot0
(define glibc-final (define glibc-final
;; The final glibc, which embeds the statically-linked Bash built above. ;; The final glibc, which embeds the statically-linked Bash built above.
(package (inherit glibc-final-with-bootstrap-bash) (package/inherit glibc-final-with-bootstrap-bash
(name "glibc") (name "glibc")
(inputs `(("static-bash" ,static-bash-for-glibc) (inputs `(("static-bash" ,static-bash-for-glibc)
,@(alist-delete ,@(alist-delete