diff options
author | Ludovic Courtès <ludo@gnu.org> | 2014-02-28 12:22:14 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-28 12:22:14 +0100 |
commit | 1faca892a35941b6eed2d6c04478f9f77ab81e15 (patch) | |
tree | b3ffac2f90d896b7288b94fd0f75a86abbe71ca9 | |
parent | 664b03103143b5b746e89d8405c0e73d05ad04a7 (diff) | |
download | guix-1faca892a35941b6eed2d6c04478f9f77ab81e15.tar.gz guix-1faca892a35941b6eed2d6c04478f9f77ab81e15.zip |
Partly revert "gnu: Remove now unneeded 'modules' fields from 'origin' specifications."
This partly reverts commit a3a1417dc715f432fadbefbe9896f56a14236741.
* gnu/packages/base.scm (glibc)[source]: Re-add 'modules' clause.
* gnu/packages/lsh.scm (lsh)[source]: Remove 'use-modules' form from
'snippet'. Add 'modules' field.
-rw-r--r-- | gnu/packages/base.scm | 1 | ||||
-rw-r--r-- | gnu/packages/lsh.scm | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 831e108520..f828f3531c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -379,6 +379,7 @@ library for working with executable and object formats is also included.") '(substitute* "sysdeps/unix/sysv/linux/configure" (("use_ldconfig=yes") "use_ldconfig=no"))) + (modules '((guix build utils))) (patches (list (search-patch "glibc-ldd-x86_64.patch"))))) (build-system gnu-build-system) diff --git a/gnu/packages/lsh.scm b/gnu/packages/lsh.scm index 56eeb08446..74857226c4 100644 --- a/gnu/packages/lsh.scm +++ b/gnu/packages/lsh.scm @@ -68,10 +68,9 @@ basis for almost any application.") (sha256 (base32 "1qqjy9zfzgny0rkb27c8c7dfsylvb6n0ld8h3an2r83pmaqr9gwb")) + (modules '((guix build utils))) (snippet '(begin - (use-modules (guix build utils)) - (substitute* "src/testsuite/functions.sh" (("localhost") ;; Avoid host name lookups since they don't work in |