phant0mas pushed a commit to branch wip-hurd
in repository guix.
commit 367d92158db1423ae7b2a5b851b6ed8d88c8425a
Author: Manolis Ragkousis <[email protected]>
Date: Fri Jul 24 22:29:28 2015 +0300
gnu: base: Add libmachuser.so and libhurduser.so to libc.so's search path.
* gnu/packages/base.scm (glibc/hurd): Add augment-libc.so phase.
---
gnu/packages/base.scm | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 18da8d1..c09ae6f 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -688,7 +688,19 @@ with the Linux kernel.")
(arguments
(substitute-keyword-arguments (package-arguments glibc/linux)
- ((#:configure-flags original-configure-flags)
+ ((#:phases original-phases)
+ ;; Add libmachuser.so and libhurduser.so to libc.so's search path.
+ ;; See
<http://lists.gnu.org/archive/html/bug-hurd/2015-07/msg00051.html>.
+ `(alist-cons-after
+ 'install 'augment-libc.so
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (substitute* (string-append out "/lib/libc.so")
+ (("/[^ ]+/lib/libc.so.0.3")
+ (string-append out "/lib/libc.so.0.3" " libmachuser.so" "
libhurduser.so"))))
+ #t)
+ ,original-phases))
+ ((#:configure-flags original-configure-flags)
`(append (list "--host=i586-pc-gnu"
;; We need this to get a working openpty() function.
