summaryrefslogtreecommitdiff
path: root/gnu/packages/education.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-07-15 19:46:40 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-07-15 19:46:40 +0200
commit5ba856aba340d85744cedcfeeb34319cb778de11 (patch)
treeb25845b37f75b46ef73c426fbea20e1b79915cd2 /gnu/packages/education.scm
parentcdc07e6854f26f7034f424822f681f2fb578247d (diff)
downloadpatches-5ba856aba340d85744cedcfeeb34319cb778de11.tar
patches-5ba856aba340d85744cedcfeeb34319cb778de11.tar.gz
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.
Diffstat (limited to 'gnu/packages/education.scm')
-rw-r--r--gnu/packages/education.scm3
1 files changed, 2 insertions, 1 deletions
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 @@
(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)