02/06: gnu: darktable: Fix build failure.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 17ac8bb67038608547801aa2563b04526fee9932
Author: Marius Bakke <address@hidden>
Date:   Thu Dec 12 01:24:32 2019 +0100

    gnu: darktable: Fix build failure.
    
    * gnu/packages/photo.scm (darktable)[arguments]: Move CPATH override from
     #:make-flags to a phase, so the GETENV call returns useful data.
---
 gnu/packages/photo.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index f6d86f0..20af5cc 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -374,18 +374,19 @@ photographic equipment.")
     (arguments
      `(#:tests? #f                      ; there are no tests
        #:configure-flags '("-DBINARY_PACKAGE_BUILD=On")
-       #:make-flags
-       (list
-        (string-append "CPATH=" (assoc-ref %build-inputs "ilmbase")
-                       "/include/OpenEXR:" (or (getenv "CPATH") "")))
        #:phases
        (modify-phases %standard-phases
-         (add-before 'configure 'set-ldflags
-           (lambda* (#:key outputs #:allow-other-keys)
+         (add-before 'configure 'set-LDFLAGS-and-CPATH
+           (lambda* (#:key inputs outputs #:allow-other-keys)
              (setenv "LDFLAGS"
                      (string-append
                       "-Wl,-rpath="
                       (assoc-ref outputs "out") "/lib/darktable"))
+
+             ;; Ensure the OpenEXR headers are found.
+             (setenv "CPATH"
+                     (string-append (assoc-ref inputs "ilmbase")
+                                    "/include/OpenEXR:" (or (getenv "CPATH") 
"")))
              #t)))))
     (native-inputs
      `(("llvm" ,llvm-3.9.1)