guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch core-updates updated: gnu: mig-boot0: Do not override phases.


From: guix-commits
Subject: branch core-updates updated: gnu: mig-boot0: Do not override phases.
Date: Sun, 11 Feb 2024 10:53:28 -0500

This is an automated email from the git hooks/post-receive script.

rekado pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new c5c91b3d2e gnu: mig-boot0: Do not override phases.
c5c91b3d2e is described below

commit c5c91b3d2ec1aa7db49f7bf834e9eb4f6fdd9af8
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sun Feb 11 16:51:46 2024 +0100

    gnu: mig-boot0: Do not override phases.
    
    The build phases of the mig package are needed also for mig-boot0, so 
instead
    of overriding all arguments we should only override the configure flags.
    
    * gnu/packages/commencement.scm (mig-boot0)[arguments]: Use
    SUBSTITUTE-KEYWORD-ARGUMENTS to replace only the configure flags.
    
    Change-Id: I8227baf9e7fabc86a8674fe694058245ce166d0f
---
 gnu/packages/commencement.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 3f2878a8a6..2feb55ba93 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
-;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2022, 2024 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2022, 2023 Ekaitz Zarraga <ekaitz@elenq.tech>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -2657,11 +2657,11 @@ memoized as a function of '%current-system'."
                           gnumach-headers-boot0))
      (inputs (list flex-boot0 gnumach-headers-boot0))
      (arguments
-      (list
-       #:configure-flags
-       #~(list (string-append "LDFLAGS=-Wl,-rpath="
-                              #$(this-package-native-input "flex")
-                              "/lib/")))))))
+      (substitute-keyword-arguments (package-arguments mig)
+        ((#:configure-flags flags '())
+         #~(list (string-append "LDFLAGS=-Wl,-rpath="
+                                #$(this-package-native-input "flex")
+                                "/lib/"))))))))
 
 (define hurd-headers-boot0
   (with-boot0



reply via email to

[Prev in Thread] Current Thread [Next in Thread]