ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 05:39:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Adjust CPATH overrides to work with GCC 7 search paths.

Browse source 
* gnu/packages/education.scm (gcompris)[arguments]: Preserve original CPATH,
if any.
* gnu/packages/games.scm (ltris, prboom-plus, abbaye, red-eclipse, btanks,
4dtris, edgar)[arguments]: Likewise.
This commit is contained in:
Marius Bakke 2019-07-15 19:46:40 +02:00
parent cdc07e6854
commit 5ba856aba3
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/packages/education.scm
View file

@ -83,7 +83,8 @@ (define-public gcompris
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append (assoc-ref inputs "sdl-mixer")
"/include/SDL"))
"/include/SDL:"
(or (getenv "CPATH") "")))
#t)))))
(inputs
`(("gtk+" ,gtk+-2)

21
gnu/packages/games.scm
View file

@ -906,7 +906,8 @@ (define-public ltris
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append (assoc-ref inputs "sdl-union")
"/include/SDL"))
"/include/SDL:"
(or (getenv "CPATH") "")))
#t)))))
(inputs
`(("sdl-union" ,(sdl-union (list sdl sdl-mixer)))))
@ -1118,7 +1119,8 @@ (define-public prboom-plus
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append (assoc-ref inputs "sdl-union")
"/include/SDL"))
"/include/SDL:"
(or (getenv "CPATH") "")))
#t)))))
(inputs
`(("fluidsynth" ,fluidsynth)
@ -1350,7 +1352,8 @@ (define-public abbaye
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append (assoc-ref inputs "sdl-union")
"/include/SDL"))))
"/include/SDL:"
(or (getenv "CPATH") "")))))
(add-after 'patch-source-shebangs 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys)
;; Replace /usr with package output directory.
@ -2992,7 +2995,8 @@ (define-public red-eclipse
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append (assoc-ref inputs "sdl-union")
"/include/SDL2"))
"/include/SDL2:"
(or (getenv "CPATH") "")))
#t))
(add-after 'install 'copy-data
(lambda* (#:key outputs #:allow-other-keys)
@ -6398,7 +6402,8 @@ (define-public btanks
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append (assoc-ref inputs "sdl")
"/include/SDL"))
"/include/SDL:"
(or (getenv "CPATH") "")))
#t))
(add-after 'unpack 'fix-compilation-errors
(lambda _
@ -6517,7 +6522,8 @@ (define-public 4dtris
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append (assoc-ref inputs "sdl")
"/include/SDL"))
"/include/SDL:"
(or (getenv "CPATH") "")))
#t)))))
(inputs
`(("fontconfig" ,fontconfig)
@ -6636,7 +6642,8 @@ (define-public edgar
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append (assoc-ref inputs "sdl2-union")
"/include/SDL2"))
"/include/SDL2:"
(or (getenv "CPATH") "")))
#t)))))
(inputs
`(("sdl2-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))