[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: packages: Use 'guile-for-grafts' for grafting.
From: |
guix-commits |
Subject: |
01/02: packages: Use 'guile-for-grafts' for grafting. |
Date: |
Mon, 27 Sep 2021 11:56:44 -0400 (EDT) |
civodul pushed a commit to branch core-updates-frozen
in repository guix.
commit 4bd69850df42cedaa0a0f25d89e23889fb4637d0
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Sep 27 11:22:52 2021 +0200
packages: Use 'guile-for-grafts' for grafting.
The call to 'guile-for-grafts' had been inadvertently replaced by a call
to 'default-guile' in commit 9e5812ac59b01ff011ec0c5b0f437dfe85d6fcc7.
Unfortunately Guile 3.0.7 still occasionally segfaults while grafting
so we still need 2.0 here.
* guix/packages.scm (package->derivation, package->cross-derivation):
Use 'guile-for-grafts' instead of 'default-guile'.
---
guix/packages.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index 863c12d..3953b7f 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -1770,7 +1770,7 @@ This is an internal procedure."
(return drv))
(grafts
(mlet %store-monad ((guile (package->derivation
- (default-guile)
+ (guile-for-grafts)
system #:graft? #f)))
(graft-derivation* drv grafts
#:system system
@@ -1793,7 +1793,7 @@ system identifying string)."
(return drv))
(grafts
(mlet %store-monad ((guile (package->derivation
- (default-guile)
+ (guile-for-grafts)
system #:graft? #f)))
(graft-derivation* drv grafts
#:system system