From patchwork Sat Apr 5 17:49:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Wilken X-Patchwork-Id: 41324 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F207C27BBE9; Sat, 5 Apr 2025 18:51:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 11FDF27BBE2 for ; Sat, 5 Apr 2025 18:51:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u17fl-0000nX-43; Sat, 05 Apr 2025 13:51:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u17fh-0000nG-Ai for guix-patches@gnu.org; Sat, 05 Apr 2025 13:51:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u17fh-0003qT-21 for guix-patches@gnu.org; Sat, 05 Apr 2025 13:51:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=cH9GOe6XLvNQzbuYoqMV5t4ZZ0JuwF2bSe/7Z+7SV2s=; b=QHg7t88VK54abirNgrOgntOtejXSiCdu9rdekWvH2ydqka3iMj+52g1c+O+0LZUxsxaWt4hOOhQle4y8HwWeeso7ime4whZmNXKHDf6I6zy2v+fiayPf/2RRiOaoZizRkMa1RND4pvazhnJEqbHMf7J0uR/pTif3qHngAXEsn05lEG6gfYbFHaHFcKKh6Cu2JfwaaAuT1VGIBEu0JuUjSEFml3clRRnLs8nFZMzOKbgzEfHj++UAqUOv8yC5ZMn/tlZA9T4weoHP1YRL180k40M7tj4W8avp/idyddhqlqSk7/YABS/vALzsCpB8IRNJhTLzbxInfkXK09vX4vuhNA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u17fa-0002RA-PY; Sat, 05 Apr 2025 13:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77556] [PATCH] gnu: flightgear: Fix build by reordering phases. Resent-From: Timo Wilken Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 05 Apr 2025 17:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77556 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77556@debbugs.gnu.org Cc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by submit@debbugs.gnu.org id=B.17438754449336 (code B ref -1); Sat, 05 Apr 2025 17:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Apr 2025 17:50:44 +0000 Received: from localhost ([127.0.0.1]:44674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u17fH-0002QV-Oq for submit@debbugs.gnu.org; Sat, 05 Apr 2025 13:50:44 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51820) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u17fF-0002QA-5j for submit@debbugs.gnu.org; Sat, 05 Apr 2025 13:50:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u17f8-0000lT-Ju for guix-patches@gnu.org; Sat, 05 Apr 2025 13:50:34 -0400 Received: from mx1.mythic-beasts.com ([2a00:1098:0:86:1000:0:2:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u17f6-0003l4-T7 for guix-patches@gnu.org; Sat, 05 Apr 2025 13:50:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=twilken.net ; s=mythic-beasts-k1; h=Date:Subject:To:From; bh=cH9GOe6XLvNQzbuYoqMV5t4ZZ0JuwF2bSe/7Z+7SV2s=; b=bawSiVXbu18YYX5mo8f3tVQynZ y8Q/zCVwzYQy3pMlNgahsLI+CDyKZCoNBoAqvIMd5zWIS0R/GUTyVF+BIKpXW0NHiZOA1jT68JLhw IRi1OVbhUGwgctZpTB4Ia4PP7oLRtmbj6rzOsS/N6YAowBw1TCCeMfUSwDJ2JbysX7ymFNPPEt1DY yiY5ssaMIJisO8lqAtrEcBx9Qa2Ujei7tDkD7naEpLYpu9T88vaj4P69D0HGPh0lotWXzsn+J18R+ k7/qqQgjKqF3buVTCKPWnnZb/dzhV90n4ttw/rcjiitGe3W29G/SaxQa3v19Gh9vA6E9Df2mVFw+p 62FPCXXA==; Received: by mailhub-cam-d.mythic-beasts.com with esmtpa (Exim 4.94.2) (envelope-from ) id 1u17f5-00FPhV-5B for guix-patches@gnu.org; Sat, 05 Apr 2025 18:50:31 +0100 From: Timo Wilken Date: Sat, 5 Apr 2025 19:49:35 +0200 Message-ID: <20250405174934.1425-2-guix@twilken.net> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-BlackCat-Spam-Score: 49 Received-SPF: pass client-ip=2a00:1098:0:86:1000:0:2:1; envelope-from=guix@twilken.net; helo=mx1.mythic-beasts.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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