From 13f7f2fd2b208c29361ef2290f55911879a6adf2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 24 Jun 2017 01:34:47 -0400 Subject: 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(-) (limited to 'gnu/packages/commencement.scm') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1b41feac1f..069ffba888 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 ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2014, 2015, 2017 Mark H Weaver ;;; ;;; 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 -- cgit v1.2.3