ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-17 20:27:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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".
This commit is contained in:
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 @@ (define-public prboom-plus
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH" (setenv "CPATH"
(string-append (string-append
(search-input-file inputs "/include/SDL") (search-input-directory inputs "/include/SDL")
":" (or (getenv "CPATH") "")))))))) ":" (or (getenv "CPATH") ""))))))))
(inputs (inputs
`(("fluidsynth" ,fluidsynth) `(("fluidsynth" ,fluidsynth)
@ -3037,7 +3037,7 @@ (define-public abbaye
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH" (setenv "CPATH"
(string-append (string-append
(search-input-file inputs "include/SDL") (search-input-directory inputs "include/SDL2")
":" (or (getenv "CPATH") ""))))) ":" (or (getenv "CPATH") "")))))
(add-after 'patch-source-shebangs 'patch-makefile (add-after 'patch-source-shebangs 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -4857,7 +4857,7 @@ (define-public red-eclipse
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH" (setenv "CPATH"
(string-append (string-append
(search-input-file inputs "/include/SDL2") (search-input-directory inputs "/include/SDL2")
":" (or (getenv "CPATH") ""))))) ":" (or (getenv "CPATH") "")))))
(add-after 'install 'copy-data (add-after 'install 'copy-data
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -8642,7 +8642,7 @@ (define-public btanks
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH" (setenv "CPATH"
(string-append (string-append
(search-input-file inputs "/include/SDL") (search-input-directory inputs "/include/SDL")
":" (or (getenv "CPATH") ""))))) ":" (or (getenv "CPATH") "")))))
(add-after 'unpack 'fix-compilation-errors (add-after 'unpack 'fix-compilation-errors
(lambda _ (lambda _
@ -8910,7 +8910,7 @@ (define-public edgar
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "CPATH" (setenv "CPATH"
(string-append (string-append
(search-input-file inputs "/include/SDL2") (search-input-directory inputs "/include/SDL2")
":" (or (getenv "CPATH") "")))))))) ":" (or (getenv "CPATH") ""))))))))
(inputs (inputs
`(("sdl2-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) `(("sdl2-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))