Browse Source

pack: 'self-contained-tarball' runs derivation in a UTF-8local.

* guix/scripts/pack.scm (self-contained-tarball)
[set-utf8-locale]: New variable.
[build]: Use it.
* tests/pack.scm ("self-contained-tarball"): Use a <profile> record
instead of 'profile-derivation'.
gn-latest-20200725
Ludovic Courtès 1 year ago
parent
commit
181e0dddd6
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 12
      guix/scripts/pack.scm
  2. 8
      tests/pack.scm

12
guix/scripts/pack.scm

@ -181,6 +181,15 @@ added to the pack."
(file-append (store-database (list profile))
"/db/db.sqlite")))
(define set-utf8-locale
;; Arrange to not depend on 'glibc-utf8-locales' when using '--bootstrap'.
(and (or (not (profile? profile))
(profile-locales? profile))
#~(begin
(setenv "GUIX_LOCPATH"
#+(file-append glibc-utf8-locales "/lib/locale"))
(setlocale LC_ALL "en_US.utf8"))))
(define build
(with-imported-modules (source-module-closure
`((guix build utils)
@ -226,6 +235,9 @@ added to the pack."
"cf" "/dev/null" "--files-from=/dev/null"
"--sort=name")))
;; Make sure non-ASCII file names are properly handled.
#+set-utf8-locale
;; Add 'tar' to the search path.
(setenv "PATH" #+(file-append archiver "/bin"))

8
tests/pack.scm

@ -57,10 +57,10 @@
(unless (network-reachable?) (test-skip 1))
(test-assertm "self-contained-tarball" %store
(mlet* %store-monad
((profile (profile-derivation (packages->manifest
(list %bootstrap-guile))
#:hooks '()
#:locales? #f))
((profile -> (profile
(content (packages->manifest (list %bootstrap-guile)))
(hooks '())
(locales? #f)))
(tarball (self-contained-tarball "pack" profile
#:symlinks '(("/bin/Guile"
-> "bin/guile"))

Loading…
Cancel
Save