diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-07-16 15:53:12 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-24 16:23:22 +0200 |
| commit | d76b2f82af738ef4c006fba9efd30c28e3d76736 (patch) | |
| tree | e305dbdec20d8edb7bc781c82ede7c4e4cfb4950 | |
| parent | 1ec13efbd214c0995c73d0a41b63552582fde8ea (diff) | |
| download | guix-d76b2f82af738ef4c006fba9efd30c28e3d76736.tar.gz | |
gnu: Use 'search-input-directory' for glibc locale data.
* gnu/packages/gnome.scm (gnome-desktop)[arguments]: Use 'search-input-directory' when searching for glibc's "lib/locale". * gnu/packages/gnome.scm (geocode-glib): Likewise. * gnu/packages/package-management.scm (flatpak): Likewise.
| -rw-r--r-- | gnu/packages/gnome.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/package-management.scm | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a7db30e678..1b35645694 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2187,9 +2187,8 @@ offline sources, providing a centralized place for managing your contacts.") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") (setenv "GUIX_LOCPATH" - (string-append (assoc-ref inputs "glibc-locales") - "/lib/locale")) - #t))))) + (search-input-directory inputs + "lib/locale"))))))) (native-inputs `(("glib:bin" ,glib "bin") ; for gdbus-codegen ("glibc-locales" ,glibc-locales) ; for tests @@ -5321,9 +5320,7 @@ permission from user.") (add-before 'check 'set-locales (lambda* (#:key inputs #:allow-other-keys) (setenv "GUIX_LOCPATH" - (string-append (assoc-ref inputs "glibc-locales") - "/lib/locale")) - #t))))) + (search-input-directory inputs "lib/locale"))))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums ("glibc-locales" ,glibc-locales) ; for tests diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c2c7846630..4ed0dabee3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1386,8 +1386,8 @@ the boot loader configuration.") (add-after 'unpack 'fix-tests (lambda* (#:key inputs #:allow-other-keys) (copy-recursively - (string-append (assoc-ref inputs "glibc-utf8-locales") - "/lib/locale/") "/tmp/locale") + (search-input-directory inputs "lib/locale") + "/tmp/locale") (for-each make-file-writable (find-files "/tmp")) (substitute* "tests/make-test-runtime.sh" (("cp `which.*") "echo guix\n") |