Merge branch 'core-updates'

Conflicts:
	guix/build/union.scm

1 files changed, 11 insertions, 9 deletions

diff --git a/distro/packages/guile.scm b/distro/packages/guile.scm
index 84ba80841e..9964f9d9f0 100644
--- a/distro/packages/guile.scm
+++ b/distro/packages/guile.scm
@@ -120,6 +120,16 @@ extensible.  It supports many SRFIs.")
 
    (self-native-input? #t)
 
+   (arguments
+    '(#:phases (alist-cons-before
+                'configure 'pre-configure
+                (lambda* (#:key inputs #:allow-other-keys)
+                  (let ((bash (assoc-ref inputs "bash")))
+                    (substitute* "module/ice-9/popen.scm"
+                      (("/bin/sh")
+                       (string-append bash "/bin/bash")))))
+                %standard-phases)))
+
    (synopsis "GNU Guile 2.0, an embeddable Scheme implementation")
    (description
 "GNU Guile is an implementation of the Scheme programming language, with
@@ -134,15 +144,7 @@ call interface, and powerful string processing.")
 (define-public guile-2.0/fixed
   ;; A package of Guile 2.0 that's rarely changed.  It is the one used
   ;; in the `base' module, and thus changing it entails a full rebuild.
-  (package (inherit guile-2.0)
-    (version "2.0.6")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnu/guile/guile-" version
-                                 ".tar.xz"))
-             (sha256
-              (base32
-               "000ng5qsq3cl1k35jvzvhwxj92wx4q87745n2fppkd4irh58vv5l"))))))
+  guile-2.0)
 
 
 ;;;