Subject: bug#77556: closed (Re: [bug#77556] [PATCH] gnu: flightgear: Fix build by reordering phases.)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 06 Apr 2025 07:24:03 +0000

Your bug report

#77556: [PATCH] gnu: flightgear: Fix build by reordering phases.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
77556: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=77556
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#77556] [PATCH] gnu: flightgear: Fix build by reordering phases.
From: 宋文武 <[email-masked]>
To: Timo Wilken <[email-masked]>
Cc: Liliana Marie Prikler <[email-masked]>, Adam Faiz <[email-masked]>, [email-masked]
Date: Sun, 06 Apr 2025 15:27:57 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Timo Wilken <[email-masked]> 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.

Subject: [PATCH] gnu: flightgear: Fix build by reordering phases.
From: Timo Wilken <[email-masked]>
To: [email-masked]
Date: Sat, 5 Apr 2025 19:49:35 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

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