03/04: gnu: fbreader: Fix build failure.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 6266a48db13f2169e3167564e143b8d4b13c0008
Author: Marius Bakke <address@hidden>
AuthorDate: Sun May 10 22:24:38 2020 +0200

    gnu: fbreader: Fix build failure.
    
    * gnu/packages/ebook.scm (fbreader)[native-inputs]: Distinguish GCC-5.
    [arguments]: Add phase 'augment-CPLUS_INCLUDE_PATH'.
---
 gnu/packages/ebook.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 48879df..4243c71 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017, 2019 Brendan Tildesley <address@hidden>
 ;;; Copyright © 2017 Roel Janssen <address@hidden>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -297,7 +298,7 @@ designed to be used in a generic text renderer.")
        ("sqlite" ,sqlite)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("gcc" ,gcc-5)
+     `(("gcc@5" ,gcc-5)
        ("pkg-config" ,pkg-config)))
     (arguments
      `(#:tests? #f ; No tests exist.
@@ -309,6 +310,18 @@ designed to be used in a generic text renderer.")
                                       (assoc-ref %outputs "out") "/lib"))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Hide the default GCC from CPLUS_INCLUDE_PATH to prevent a 
header
+             ;; conflict with the GCC provided in native-inputs.
+             (let ((gcc (assoc-ref inputs "gcc")))
+               (setenv "CPLUS_INCLUDE_PATH"
+                       (string-join
+                        (delete (string-append gcc "/include/c++")
+                                (string-split (getenv "CPLUS_INCLUDE_PATH")
+                                              #\:))
+                        ":"))
+               #t)))
          (delete 'configure)
          (add-after 'unpack 'fix-install-locations
            (lambda* (#:key outputs #:allow-other-keys)