From ed69ed73c1bf30a3903d63926c04af50a48aedf5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 21 May 2025 16:51:53 +0300 Subject: [PATCH] guix: gnu-dist: Fix distcheck. * guix/build/gnu-dist.scm (build): Add a configure-flag during the distcheck rebuild to use a shell we have in the build environment. Change-Id: I3519ab498ef47728729297a70ac1dce8e1b922ee --- guix/build/gnu-dist.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/build/gnu-dist.scm b/guix/build/gnu-dist.scm index cc48d3bdbffbbed706cd5a9c05638aeb333e557f..59ac0012b800db63f5b3eda17771264dbf85d0c7 100644 --- a/guix/build/gnu-dist.scm +++ b/guix/build/gnu-dist.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015, 2020, 2023 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2025 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +38,8 @@ (let ((build (assq-ref %standard-phases 'build))) (apply build args))) (format #t "building target `~a'~%" dist-target) + (setenv "DISTCHECK_CONFIGURE_FLAGS" + (string-append "SHELL=" (which "sh"))) (apply invoke "make" dist-target make-flags)) (define* (install-dist #:key outputs #:allow-other-keys)