mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 1d9fb12fd3282871fce1c55b389bc2cc21087ce5
Author: Mathieu Othacehe <[email protected]>
Date: Thu Jul 4 17:39:54 2019 +0200
gnu: glibc-utf8-locales: Fix cross-compilation.
* gnu/packages/base.scm (glibc-utf8-locales)[inputs]: Move to ...
[native-inputs]: ... here, in order to fix cross-compilation.
* gnu/packages/commencement.scm (glibc-utf8-locales-final)[inputs]: Move to
...
[native-inputs]: ... here, in order to fix cross-compilation.
---
gnu/packages/base.scm | 4 ++--
gnu/packages/commencement.scm | 11 ++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 791647d..ebaa93f 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1112,8 +1112,8 @@ to the @code{share/locale} sub-directory of this
package.")
;; tests---e.g., in Guile's i18n tests.
'("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
#t))))
- (inputs `(("glibc" ,glibc)
- ("gzip" ,gzip)))
+ (native-inputs `(("glibc" ,glibc)
+ ("gzip" ,gzip)))
(synopsis "Small sample of UTF-8 locales")
(description
"This package provides a small sample of UTF-8 locales mostly useful in
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 69d1f87..615d97d 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2350,11 +2350,12 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker
-Wl,~a/~a \"$@\"~%"
;; function.)
(package
(inherit glibc-utf8-locales)
- (inputs `(("glibc" ,glibc-final)
- ("gzip"
- ,(package-with-explicit-inputs gzip %boot4-inputs
- (current-source-location)
- #:guile %bootstrap-guile))))))
+ (native-inputs
+ `(("glibc" ,glibc-final)
+ ("gzip"
+ ,(package-with-explicit-inputs gzip %boot4-inputs
+ (current-source-location)
+ #:guile %bootstrap-guile))))))
(define-public ld-wrapper
;; The final 'ld' wrapper, which uses the final Guile and Binutils.
