From bbc26afd6198a55109589ed6477f13f1bcea1898 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 2 Feb 2022 17:54:44 +0100 Subject: gnu: luminance-hdr: Fix compilation. Reported by Leo Famulari . * gnu/packages/image-viewers.scm (luminance-hdr)[arguments]: In 'add-ilmbase-include-path' phase, set C_INCLUDE_PATH and be more specific about the include directory searched for. --- gnu/packages/image-viewers.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 87dffbb93d..aac27b6703 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2013, 2017-2022 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015, 2016 Alex Kost ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner @@ -631,11 +631,12 @@ It supports JPEG, PNG and GIF formats.") (lambda* (#:key inputs #:allow-other-keys) ;; 'OpenEXR.pc' has a -I for IlmBase but 'FindOpenEXR.cmake' does ;; not use 'OpenEXR.pc'. Thus, we need to add - ;; "$ilmbase/include/OpenEXR/" to the CPATH. - (setenv "CPATH" + ;; "$ilmbase/include/OpenEXR/" to the CPLUS_INCLUDE_PATH. + (setenv "CPLUS_INCLUDE_PATH" (string-append - (search-input-directory inputs "include/OpenEXR") - ":" (or (getenv "CPATH") "")))))))) + (dirname + (search-input-file inputs "include/OpenEXR/ImathInt64.h")) + ":" (or (getenv "CPLUS_INCLUDE_PATH") "")))))))) (home-page "http://qtpfsgui.sourceforge.net") (synopsis "High dynamic range (HDR) imaging application") (description -- cgit v1.2.3