From ef015aecf7a222cc385f90e58eb62550d35f02c4 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Thu, 29 Jun 2023 14:16:12 -0400 Subject: nonguix: glibc-for-fhs: Remove variable. * nonguix/multiarch-container.scm (glibc-for-fhs): Remove. (fhs-min-libs): Use upstream glibc-for-fhs. --- nonguix/multiarch-container.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'nonguix') 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")) -- cgit v1.2.3