GNU bug report logs - #78538
[PATCH] guix: gnu-dist: Fix distcheck.

Previous Next

Package: guix-patches;

Reported by: Efraim Flashner <efraim <at> flashner.co.il>

Date: Wed, 21 May 2025 15:50:03 UTC

Severity: normal

Tags: patch

Done: Efraim Flashner <efraim <at> flashner.co.il>

Full log


Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: guix-patches <at> gnu.org
Cc: Efraim Flashner <efraim <at> flashner.co.il>
Subject: [PATCH] guix: gnu-dist: Fix distcheck.
Date: Wed, 21 May 2025 18:49:02 +0300
* 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 cc48d3bdbff..59ac0012b80 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 <ludo <at> gnu.org>
 ;;; Copyright © 2018 Mark H Weaver <mhw <at> netris.org>
+;;; Copyright © 2025 Efraim Flashner <efraim <at> flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,6 +38,8 @@ (define* (build #:key build-before-dist? make-flags (dist-target "distcheck")
     (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)

base-commit: 11bc17c409d77cd1af91e30b5b9f6a73f873a152
-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted





This bug report was last modified 7 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.