diff options
| author | Marius Bakke <marius@gnu.org> | 2022-02-13 14:24:53 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-02-13 14:24:53 +0100 |
| commit | 76b6bbdf232b4b82cdd23cfe0d81331a4fd2edec (patch) | |
| tree | 0e6a57ba08b9c6f9f5cbcdc5b5d9daeea91e428d /gnu/packages/image-viewers.scm | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
| parent | e8af2ea63a7f497b8f8e19e206645109c0646e72 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image-viewers.scm')
| -rw-r--r-- | gnu/packages/image-viewers.scm | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index b61a79370d..641b5a52da 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 <ludo@gnu.org> +;;; Copyright © 2013, 2017-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> @@ -604,23 +604,25 @@ It supports JPEG, PNG and GIF formats.") (native-inputs (list pkg-config qttools)) (inputs - `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg) - ("qtwebkit" ,qtwebkit) - ("boost" ,boost) - ("eigen" ,eigen) - ;; ("gtest" ,gtest) - ("libraw" ,libraw) - ("zlib" ,zlib) - ("exiv2" ,exiv2) - ("libpng" ,libpng) - ("libjpeg" ,libjpeg-turbo) - ("lcms" ,lcms) - ("openexr" ,openexr-2) - ("fftw" ,fftwf) - ("gsl" ,gsl) - ("libtiff" ,libtiff))) + (list qtbase-5 + qtdeclarative + qtsvg + boost + eigen + ;; gtest + libraw + zlib + exiv2 + libpng + libjpeg-turbo + lcms + openexr-2 + qtwebengine + qtdeclarative + qtwebchannel + fftwf + gsl + libtiff)) (arguments '(#:tests? #f ;XXX: some tests fail to compile #:phases @@ -629,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 |