diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-06-24 01:34:47 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-06-24 02:42:27 -0400 |
| commit | 13f7f2fd2b208c29361ef2290f55911879a6adf2 (patch) | |
| tree | 0145e713fe025c1cbd7cd5440ced6de27611a870 /gnu/packages | |
| parent | 56ed97c8b54e6d4fbf049f01e9dbb9da65d3677c (diff) | |
| download | gnu-guix-13f7f2fd2b208c29361ef2290f55911879a6adf2.tar gnu-guix-13f7f2fd2b208c29361ef2290f55911879a6adf2.tar.gz | |
gnu: glibc-final: Add support for grafted glibc.
* gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)
(glibc-final): Use 'package/inherit'.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/commencement.scm | 6 |
1 files changed, 3 insertions, 3 deletions
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 <ludo@gnu.org> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; 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. ;;; @@ -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 |