diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-11 19:49:27 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-11 19:49:27 +0100 |
| commit | 63d4ef52ebad4157817d56ccbe974da8fff81929 (patch) | |
| tree | 058d5a4bf953622d89d2d91d2c9054200bbe8cc2 /gnu/packages/games.scm | |
| parent | f85ca6eda044c43bd5b9b54e756c02fd90c372f1 (diff) | |
| download | patches-63d4ef52ebad4157817d56ccbe974da8fff81929.tar patches-63d4ef52ebad4157817d56ccbe974da8fff81929.tar.gz | |
gnu: Remove GCC < 7 workarounds.
* gnu/packages/emulators.scm (dolphin-emu)[native-inputs]: Remove GCC-7.
[arguments]: Adjust accordingly.
* gnu/packages/games.scm (openrct2): Likewise.
* gnu/packages/linux.scm (make-linux-libre): Likewise.
* gnu/packages/mpd.scm (mpd): Likewise.
* gnu/packages/storage.scm (ceph): Likewise.
Diffstat (limited to 'gnu/packages/games.scm')
| -rw-r--r-- | gnu/packages/games.scm | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f46da6cff4..8858de7713 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2615,16 +2615,12 @@ Transport Tycoon Deluxe.") "/share/openrct2/title-sequences") "data/title") (copy-recursively (string-append objects "/share/openrct2/objects") "data/object")))) - (add-before 'configure 'fixgcc7 - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) - (add-after 'fixgcc7 'get-rid-of-errors + (add-before 'configure 'get-rid-of-errors (lambda _ ;; Don't treat warnings as errors. (substitute* "CMakeLists.txt" - (("-Werror") ""))))))) + (("-Werror") "")) + #t))))) (inputs `(("curl" ,curl) ("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -2640,8 +2636,7 @@ Transport Tycoon Deluxe.") ("speexdsp" ,speexdsp) ("zlib" ,zlib))) (native-inputs - `(("gcc" ,gcc-7) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/OpenRCT2/OpenRCT2") (synopsis "Free software re-implementation of RollerCoaster Tycoon 2") (description "OpenRCT2 is a free software re-implementation of |