me
/
guix
Archived
1
0
Fork 0
Code

gnu: Use 'search-input-directory' for the SDL header directory. 

This is a followup to bf182596a9.

* gnu/packages/games.scm (prboom-plus, red-eclipse, btanks)
(edgar): Use 'search-input-directory' instead of 'search-input-file'
when looking for "include/SDL".
(abbaye): Likewise, and search "include/SDL2" instead of "include/SDL".
master
Ludovic Courtès 2021-11-25 21:56:25 +01:00
parent fa35a5f649
commit 138498feec
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/games.scm
View File

@ -2195,7 +2195,7 @@ Every puzzle has a complete solution, although there may be more than one.")
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append
(search-input-file inputs "/include/SDL")
(search-input-directory inputs "/include/SDL")
":" (or (getenv "CPATH") ""))))))))
(inputs
`(("fluidsynth" ,fluidsynth)
@ -3037,7 +3037,7 @@ properly.")
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append
(search-input-file inputs "include/SDL")
(search-input-directory inputs "include/SDL2")
":" (or (getenv "CPATH") "")))))
(add-after 'patch-source-shebangs 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys)
@ -4857,7 +4857,7 @@ http://lavachat.symlynx.com/unix/")
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append
(search-input-file inputs "/include/SDL2")
(search-input-directory inputs "/include/SDL2")
":" (or (getenv "CPATH") "")))))
(add-after 'install 'copy-data
(lambda* (#:key outputs #:allow-other-keys)
@ -8642,7 +8642,7 @@ download and unpack them separately.")
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append
(search-input-file inputs "/include/SDL")
(search-input-directory inputs "/include/SDL")
":" (or (getenv "CPATH") "")))))
(add-after 'unpack 'fix-compilation-errors
(lambda _
@ -8910,7 +8910,7 @@ where the player draws runes in real time to effect the desired spell.")
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH"
(string-append
(search-input-file inputs "/include/SDL2")
(search-input-directory inputs "/include/SDL2")
":" (or (getenv "CPATH") ""))))))))
(inputs
`(("sdl2-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))