amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Use 'search-input-directory' for the OpenEXR header directory.

Browse source 
* gnu/packages/graphics.scm (blender): Use 'search-input-directory' when
searching for "include/OpenEXR".
(blender-2.79): Likewise.
* gnu/packages/image-processing.scm (opencv): Likewise.
* gnu/packages/image-viewers.scm (luminance-hdr): Likewise.
* gnu/packages/photo.scm (darktable): Likewise.
This commit is contained in:
Ludovic Courtès 2021-07-16 15:44:33 +02:00
parent bf182596a9
commit 00d1ccaf12
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
4 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/graphics.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
@ -556,10 +556,9 @@ typically encountered in feature film production.")
;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
;; the CPATH to satisfy the dependency on "half.h". ;; the CPATH to satisfy the dependency on "half.h".
(setenv "CPATH" (setenv "CPATH"
(string-append (assoc-ref inputs "ilmbase") (string-append
"/include/OpenEXR" (search-input-directory inputs "include/OpenEXR")
":" (or (getenv "CPATH") ""))) ":" (or (getenv "CPATH") "")))))))))
#t))))))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("jemalloc" ,jemalloc) ("jemalloc" ,jemalloc)
@ -658,10 +657,9 @@ application can be customized via its API for Python scripting.")
;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
;; the CPATH to satisfy the dependency on "half.h". ;; the CPATH to satisfy the dependency on "half.h".
(setenv "CPATH" (setenv "CPATH"
(string-append (assoc-ref inputs "ilmbase") (string-append
"/include/OpenEXR" (search-input-directory inputs "include/OpenEXR")
":" (or (getenv "CPATH") ""))) ":" (or (getenv "CPATH") "")))))))))
#t))))))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("jemalloc" ,jemalloc) ("jemalloc" ,jemalloc)

7
gnu/packages/image-processing.scm
View file

@ -589,10 +589,9 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
;; the CPATH to satisfy the dependency on "ImathVec.h". ;; the CPATH to satisfy the dependency on "ImathVec.h".
(setenv "CPATH" (setenv "CPATH"
(string-append (assoc-ref inputs "ilmbase") (string-append
"/include/OpenEXR" (search-input-directory inputs "include/OpenEXR")
":" (or (getenv "CPATH") ""))) ":" (or (getenv "CPATH") "")))))
#t))
(add-before 'check 'start-xserver (add-before 'check 'start-xserver
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((xorg-server (assoc-ref inputs "xorg-server")) (let ((xorg-server (assoc-ref inputs "xorg-server"))

9
gnu/packages/image-viewers.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
@ -556,10 +556,9 @@ It supports JPEG, PNG and GIF formats.")
;; not use 'OpenEXR.pc'. Thus, we need to add ;; not use 'OpenEXR.pc'. Thus, we need to add
;; "$ilmbase/include/OpenEXR/" to the CPATH. ;; "$ilmbase/include/OpenEXR/" to the CPATH.
(setenv "CPATH" (setenv "CPATH"
(string-append (assoc-ref inputs "ilmbase") (string-append
"/include/OpenEXR" (search-input-directory inputs "include/OpenEXR")
":" (or (getenv "CPATH") ""))) ":" (or (getenv "CPATH") ""))))))))
#t)))))
(home-page "http://qtpfsgui.sourceforge.net") (home-page "http://qtpfsgui.sourceforge.net")
(synopsis "High dynamic range (HDR) imaging application") (synopsis "High dynamic range (HDR) imaging application")
(description (description

8
gnu/packages/photo.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2017 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2017 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
@ -506,9 +506,9 @@ photographic equipment.")
;; Ensure the OpenEXR headers are found. ;; Ensure the OpenEXR headers are found.
(setenv "CPATH" (setenv "CPATH"
(string-append (assoc-ref inputs "ilmbase") (string-append
"/include/OpenEXR:" (or (getenv "CPATH") ""))) (search-input-directory inputs "include/OpenEXR")
#t)) ":" (or (getenv "CPATH") "")))))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out") (wrap-program (string-append (assoc-ref outputs "out")