summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
Diffstat (limited to 'guix')
-rw-r--r--guix/build/download.scm5
-rw-r--r--guix/config.scm.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/guix/build/download.scm b/guix/build/download.scm
index 9d90971f28..c09351cee4 100644
--- a/guix/build/download.scm
+++ b/guix/build/download.scm
@@ -92,6 +92,11 @@ which is not available during bootstrap."
'set-port-encoding!
(lambda (p e) #f))
+;; XXX: Work around <http://bugs.gnu.org/13095>, present in Guile
+;; up to 2.0.7.
+(module-define! (resolve-module '(web client))
+ 'shutdown (const #f))
+
(define (http-fetch uri file)
"Fetch data from URI and write it to FILE. Return FILE on success."
diff --git a/guix/config.scm.in b/guix/config.scm.in
index 4717b1c967..c5ebd39fae 100644
--- a/guix/config.scm.in
+++ b/guix/config.scm.in
@@ -46,7 +46,8 @@
"@storedir@")
(define %state-directory
- "@guix_localstatedir@")
+ ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'.
+ "@guix_localstatedir@/nix")
(define %system
"@guix_system@")