me
/
guix
Archived
1
0
Fork 0
Code

gnu: flightgear: Use G-expressions. 

This fixes the build by removing broken usage of %outputs.

* gnu/packages/games.scm (flightgear)[arguments]:
Rewrite as G-expressions.
master
Tobias Geerinckx-Rice 2022-02-27 01:00:01 +01:00
parent 7620dacc8b
commit 3a72ee1046
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
gnu/packages/games.scm
View File

@ -9178,39 +9178,39 @@ and also provides the base for the FlightGear Flight Simulator.")
#t))))
(build-system qt-build-system)
(arguments
`(#:configure-flags
(list "-DSYSTEM_SQLITE=ON"
"-DSYSTEM_CPPUNIT=ON"
(string-append "-DFG_DATA_DIR="
(assoc-ref %outputs "out")
"/share/flightgear"))
;; TODO: test suite segfaults.
#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-some-tests
(lambda _
(substitute* "test_suite/unit_tests/Instrumentation/test_gps.hxx"
(("CPPUNIT_TEST\\(testLongLegWestbound\\);" all)
(string-append "// " all))
(("CPPUNIT_TEST\\(testFinalLegCourse\\);" all)
(string-append "// " all)))))
(add-after 'build 'build-test-suite
(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* (#:key inputs outputs #:allow-other-keys)
(let ((share (string-append (assoc-ref outputs "out") "/share/flightgear")))
(mkdir-p share)
(with-directory-excursion share
(invoke "tar" "xf" (assoc-ref inputs "flightgear-data")
"--strip-components=1")))
#t)))))
(list #:configure-flags
#~(list "-DSYSTEM_SQLITE=ON"
"-DSYSTEM_CPPUNIT=ON"
(string-append "-DFG_DATA_DIR=" #$output "/share/flightgear"))
;; TODO: test suite segfaults.
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-some-tests
(lambda _
(substitute*
"test_suite/unit_tests/Instrumentation/test_gps.hxx"
(("CPPUNIT_TEST\\(testLongLegWestbound\\);" all)
(string-append "// " all))
(("CPPUNIT_TEST\\(testFinalLegCourse\\);" all)
(string-append "// " all)))))
(add-after 'build 'build-test-suite
(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")))
(mkdir-p share)
(with-directory-excursion share
(invoke "tar" "xf"
#$(this-package-native-input "flightgear-data")
"--strip-components=1")))
#t)))))
(inputs
(list boost
dbus