summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-12-03 21:50:46 +0100
committerLudovic Courtès <ludo@gnu.org>2017-12-03 21:50:46 +0100
commit2815fca1423cf72e6f3d0e774f1058bcbf8dfdbf (patch)
tree9a7eebf5fc10db57a03b99496a5f1506a25fa8bb
parent8638362f138101d36064e8fd5e9115c250cdfec4 (diff)
downloadguix-2815fca1423cf72e6f3d0e774f1058bcbf8dfdbf.tar.gz
profile: Use _IO* but disable deprecation warning.
This fixes a regression introduced in
2f60084f77815f454d1521396c2a383390ea2865, whereby the profile derivation
would fail to run on Guile 2.0 (as is the case with "guix package
--bootstrap").

Reported by Christopher Baines.

* guix/profiles.scm (profile-derivation)[builder]: Use _IO* but add
'debug-disable' call.
-rw-r--r--guix/profiles.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 011bc54d23..d8b83bf730 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1268,8 +1268,11 @@ are cross-built for TARGET."
                          (guix search-paths)
                          (srfi srfi-1))
 
-            (setvbuf (current-output-port) 'line)
-            (setvbuf (current-error-port) 'line)
+            ;; Don't complain about _IO* on Guile 2.2.
+            (debug-disable 'warn-deprecated)
+
+            (setvbuf (current-output-port) _IOLBF)
+            (setvbuf (current-error-port) _IOLBF)
 
             #+(if locales? set-utf8-locale #t)