From 5ba856aba340d85744cedcfeeb34319cb778de11 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 15 Jul 2019 19:46:40 +0200
Subject: gnu: Adjust CPATH overrides to work with GCC 7 search paths.

* 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.
---
 gnu/packages/education.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/education.scm')

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index f3d8907583..493a97fdf8 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -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)
-- 
cgit v1.2.3