~ruther/guix-local: Partly revert "gnu: Remove now unneeded 'modules' fields from 'origin' specifications."

1faca892a35941b6eed2d6c04478f9f77ab81e15 — Ludovic Courtès 12 years ago 664b031

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.

patch browse .tar.gz

2 files changed, 2 insertions(+), 2 deletions(-)

M gnu/packages/base.scm
M gnu/packages/lsh.scm

M gnu/packages/base.scm => gnu/packages/base.scm +1 -0

@@ 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)

M gnu/packages/lsh.scm => gnu/packages/lsh.scm +1 -2

@@ 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