mhw pushed a commit to branch master
in repository guix.
commit 13f7f2fd2b208c29361ef2290f55911879a6adf2
Author: Mark H Weaver <[email protected]>
Date: Sat Jun 24 01:34:47 2017 -0400
gnu: glibc-final: Add support for grafted glibc.
* gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)
(glibc-final): Use 'package/inherit'.
---
gnu/packages/commencement.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 1b41fea..069ffba 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès
<[email protected]>
;;; Copyright © 2014 Andreas Enge <[email protected]>
;;; Copyright © 2012 Nikita Karetnikov <[email protected]>
-;;; Copyright © 2014, 2015 Mark H Weaver <[email protected]>
+;;; Copyright © 2014, 2015, 2017 Mark H Weaver <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -467,7 +467,7 @@ the bootstrap environment."
;; built just below; the only difference is that this one uses the
;; bootstrap Bash.
(package-with-bootstrap-guile
- (package (inherit glibc)
+ (package/inherit glibc
(name "glibc-intermediate")
(arguments
`(#:guile ,%bootstrap-guile
@@ -640,7 +640,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"$@\"~%"
(define glibc-final
;; 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")
(inputs `(("static-bash" ,static-bash-for-glibc)
,@(alist-delete
