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

[guix-commits]

civodul pushed a commit to branch core-updates-frozen
in repository guix.

commit 138498feec335f68935f00f8a97924c90c7f59b0
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Nov 25 21:56:25 2021 +0100

    gnu: Use 'search-input-directory' for the SDL header directory.
    
    This is a followup to bf182596a9d85604f6f029302671a38001575355.
    
    * 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".
---
 gnu/packages/games.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 99c4b0a..cdd3452 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -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)))