aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-09-13 10:10:49 +0200
committerLudovic Courtès <ludo@gnu.org>2018-09-13 10:29:59 +0200
commit78c9058dde237d6913a30a40c1f5ca19395f86c3 (patch)
treeb923565b9e20a4f8b3683e6803aa38fe65dcf91a
parent88bfabf111dfc794dc8c8f6d44d253842b39b55e (diff)
downloadguix-78c9058dde237d6913a30a40c1f5ca19395f86c3.tar
guix-78c9058dde237d6913a30a40c1f5ca19395f86c3.tar.gz
build-self: Add a dummy (git) module to 'compute-guix-derivation'.
Fixes a regression introduced in aed0a594058a59bc3bb1d2686391dc0e8a181b1f. * build-aux/build-self.scm (build-program)[fake-git]: New variable. Use it as an imported module.
-rw-r--r--build-aux/build-self.scm8
1 files changed, 8 insertions, 0 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index f91b43987a..09979dc410 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -263,6 +263,9 @@ interface (FFI) of Guile.")
#~(define-module (gcrypt hash)
#:export (sha1 sha256))))
+ (define fake-git
+ (scheme-file "git.scm" #~(define-module (git))))
+
(with-imported-modules `(((guix config)
=> ,(make-config.scm))
@@ -272,6 +275,11 @@ interface (FFI) of Guile.")
;; adjust %LOAD-PATH later on.
((gcrypt hash) => ,fake-gcrypt-hash)
+ ;; (guix git-download) depends on (git) but only
+ ;; for peripheral functionality. Provide a dummy
+ ;; (git) to placate it.
+ ((git) => ,fake-git)
+
,@(source-module-closure `((guix store)
(guix self)
(guix derivations)