Merge branch 'staging' into core-updates

[jackhill/guix/guix.git] / gnu / packages / games.scm

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2950073..ed61f7d 100644 (file)
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2626,16 +2626,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)
@@ -2651,8 +2647,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
@@ -3649,7 +3644,8 @@ throwing people around in pseudo-randomly generated buildings.")
          (add-after 'set-paths 'set-sdl-paths
            (lambda* (#:key inputs #:allow-other-keys)
              (setenv "CPATH"
-                     (string-append (assoc-ref inputs "sdl-union")
+                     (string-append (getenv "CPATH") ":"
+                                    (assoc-ref inputs "sdl-union")
                                     "/include/SDL"))))
          (replace 'configure
            (lambda* (#:key inputs outputs #:allow-other-keys)