GNU bug report logs - #77556
[PATCH] gnu: flightgear: Fix build by reordering phases.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 77556 in the body.
You can then email your comments to 77556 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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

From: Timo Wilken <guix <at> twilken.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: flightgear: Fix build by reordering phases.
Date: Sat,  5 Apr 2025 19:49:35 +0200

Guix can't find the `install-data' phase yet when `check' is redefined, so
swap the definitions of `install-data' and `check'.

* gnu/packages/games.scm (flightgear): Swap `install-data' and `check'.

Change-Id: Ifb4e4f0f3a09a2d2e596681ecb7c6c481f0e16b1
---
 gnu/packages/games.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 328af308a58..a69b492e6ca 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10665,10 +10665,6 @@ (define-public flightgear
                  (lambda* args
                    ((assoc-ref %standard-phases 'build)
                     #:make-flags (list "fgfs_test_suite"))))
-               ;; Test suite needs access to FGData so run it after 'install.
-               (delete 'check)
-               (add-after 'install-data 'check
-                 (assoc-ref %standard-phases 'check))
                (add-after 'install 'install-data
                  (lambda _
                    (let ((share (string-append #$output "/share/flightgear")))
@@ -10676,7 +10672,11 @@ (define-public flightgear
                      (with-directory-excursion share
                        (invoke "tar" "xf"
                                #$(this-package-native-input "flightgear-data")
-                               "--strip-components=1"))))))))
+                               "--strip-components=1")))))
+               ;; Test suite needs access to FGData so run it after 'install.
+               (delete 'check)
+               (add-after 'install-data 'check
+                 (assoc-ref %standard-phases 'check)))))
     (inputs
      (list boost
            dbus
-- 
2.49.0

Message #10 received at 77556-done <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: Timo Wilken <guix <at> twilken.net>
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 Adam Faiz <adam.faiz <at> disroot.org>, 77556-done <at> debbugs.gnu.org
Subject: Re: [bug#77556] [PATCH] gnu: flightgear: Fix build by reordering
 phases.
Date: Sun, 06 Apr 2025 15:27:57 +0800

Timo Wilken <guix <at> twilken.net> writes:

> Guix can't find the `install-data' phase yet when `check' is redefined, so
> swap the definitions of `install-data' and `check'.
>
> * gnu/packages/games.scm (flightgear): Swap `install-data' and `check'.

Pushed as commit 85eb725, with simplified commit message, thanks.

Message #13 received at 77556-done <at> debbugs.gnu.org (full text, mbox):

From: "Timo Wilken" <guix <at> twilken.net>
To: 宋文武 <iyzsong <at> envs.net>
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 Adam Faiz <adam.faiz <at> disroot.org>, 77556-done <at> debbugs.gnu.org
Subject: Re: [bug#77556] [PATCH] gnu: flightgear: Fix build by reordering
 phases.
Date: Tue, 08 Apr 2025 19:24:31 +0200

On Sun 6 Apr 2025 at 9:27 am CEST, 宋文武 wrote:
> Pushed as commit 85eb725, with simplified commit message, thanks.

Thank you, 宋文武!

Previous Next

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