guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 421bb77c816936ba2a58d59fac162a9499ce8560
Author: Andreas Enge <[email protected]>
AuthorDate: Wed Nov 18 23:02:45 2026 +0100
gnu: flightgear: Drop input labels.
* gnu/packages/games.scm (%flightgear-version, %flightgear-data-name,
flightgear-data): New variables.
(flightgear)[version]: Use new version variable.
[arguments]<#:phases>{install-data}: Use new name variable.
[native-inputs]: Drop labels.
---
gnu/packages/games.scm | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 3b561eca384..464a6fa5dcd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -12043,10 +12043,25 @@ visualization applications. SimGear is developed by
the FlightGear project
and also provides the base for the FlightGear Flight Simulator.")
(license license:lgpl2.0+)))
+(define %flightgear-version (package-version simgear))
+(define %flightgear-data-name (string-append "flightgear-data-"
+ %flightgear-version))
+
+(define flightgear-data
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://mirrors.ibiblio.org/flightgear/ftp/release-"
+ (version-major+minor %flightgear-version) "/"
+ "FlightGear-" %flightgear-version "-data.txz"))
+ (file-name %flightgear-data-name)
+ (sha256
+ (base32
+ "0ypr92nj1m229gw3jmyn67jk8qfbqbh7hgzbalwimvpmrx8s87fy"))))
+
(define-public flightgear
(package
(name "flightgear")
- (version (package-version simgear))
+ (version %flightgear-version)
(source
(origin
(method git-fetch)
@@ -12102,7 +12117,8 @@ and also provides the base for the FlightGear Flight
Simulator.")
(mkdir-p share)
(with-directory-excursion share
(invoke "tar" "xf"
- #$(this-package-native-input "flightgear-data")
+ #$(this-package-native-input
+ %flightgear-data-name)
"--strip-components=1")))))
(add-after 'qt-wrap 'fg-root-wrap
(lambda _
@@ -12133,18 +12149,10 @@ and also provides the base for the FlightGear Flight
Simulator.")
sqlite
zlib))
(native-inputs
- `(("cppunit" ,cppunit)
- ("pkg-config" ,pkg-config)
- ("qttools" ,qttools)
- ("flightgear-data"
- ,(origin
- (method url-fetch)
- (uri (string-append
"https://mirrors.ibiblio.org/flightgear/ftp/release-"
- (version-major+minor version) "/"
- "FlightGear-" version "-data.txz"))
- (sha256
- (base32
- "0ypr92nj1m229gw3jmyn67jk8qfbqbh7hgzbalwimvpmrx8s87fy"))))))
+ (list cppunit
+ flightgear-data
+ pkg-config
+ qttools))
(home-page "https://www.flightgear.org/")
(synopsis "Flight simulator")
(description "The goal of the FlightGear project is to create a