diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2023-06-29 14:16:12 -0400 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2023-06-29 14:16:12 -0400 |
| commit | ef015aecf7a222cc385f90e58eb62550d35f02c4 (patch) | |
| tree | 47c07ab38823692a265611e30446a89ad2aa290c /nonguix | |
| parent | bbbaeb2b824e4ce9ea54be747701faa5f71dc6c2 (diff) | |
nonguix: glibc-for-fhs: Remove variable.
* nonguix/multiarch-container.scm (glibc-for-fhs): Remove.
(fhs-min-libs): Use upstream glibc-for-fhs.
Diffstat (limited to 'nonguix')
| -rw-r--r-- | nonguix/multiarch-container.scm | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index 85d36ad..92e49dc 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -104,19 +104,8 @@ (description ngc-description (default #f)) (license ngc-license (default #f))) -(define glibc-for-fhs - (package - (inherit glibc) - (name "glibc-for-fhs") - (source (origin (inherit (package-source glibc)) - ;; Remove Guix's patch to read ld.so.cache from /gnu/store - ;; directories, re-enabling the default /etc/ld.so.cache - ;; behavior. - (patches (delete (car (search-patches "glibc-dl-cache.patch")) - (origin-patches (package-source glibc)))))))) - (define fhs-min-libs - `(("glibc" ,glibc-for-fhs) + `(("glibc" ,(@@ (gnu packages base) glibc-for-fhs)) ("glibc-locales" ,glibc-locales))) (define* (fhs-union inputs #:key (name "fhs-union") (version "0.0") (system "x86_64-linux")) |