diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 4bdc3e7792..2a9f2f34fc 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -928,6 +929,20 @@ (define (linker-script? file) (license lgpl2.0+) (home-page "https://www.gnu.org/software/libc/"))) +;; Define a variation of glibc which uses the default /etc/ld.so.cache, useful +;; in FHS containers. +(define-public glibc-for-fhs + (hidden-package + (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 (search-patch "glibc-dl-cache.patch") + (origin-patches (package-source glibc))))))))) + ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) (define-public glibc-2.32