mirror of
https://gitlab.com/nonguix/nonguix.git
synced 2024-12-01 12:44:11 +01:00
nonguix: glibc-for-fhs: Remove variable.
* nonguix/multiarch-container.scm (glibc-for-fhs): Remove. (fhs-min-libs): Use upstream glibc-for-fhs.
This commit is contained in:
parent
bbbaeb2b82
commit
ef015aecf7
1 changed files with 1 additions and 12 deletions
|
@ -104,19 +104,8 @@
|
||||||
(description ngc-description (default #f))
|
(description ngc-description (default #f))
|
||||||
(license ngc-license (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
|
(define fhs-min-libs
|
||||||
`(("glibc" ,glibc-for-fhs)
|
`(("glibc" ,(@@ (gnu packages base) glibc-for-fhs))
|
||||||
("glibc-locales" ,glibc-locales)))
|
("glibc-locales" ,glibc-locales)))
|
||||||
|
|
||||||
(define* (fhs-union inputs #:key (name "fhs-union") (version "0.0") (system "x86_64-linux"))
|
(define* (fhs-union inputs #:key (name "fhs-union") (version "0.0") (system "x86_64-linux"))
|
||||||
|
|
Loading…
Reference in a new issue