diff options
Diffstat (limited to 'gnu/packages/photo.scm')
| -rw-r--r-- | gnu/packages/photo.scm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 673989e06b..2197623363 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2017, 2019 Ludovic Courtès <[email protected]> +;;; Copyright © 2014, 2015, 2017, 2019, 2021 Ludovic Courtès <[email protected]> ;;; Copyright © 2015 Ricardo Wurmus <[email protected]> ;;; Copyright © 2015, 2017 Andreas Enge <[email protected]> ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner <[email protected]> @@ -156,13 +156,13 @@ "/bin")) ":")) (gi-typelib-path (getenv "GI_TYPELIB_PATH")) - (python-path (getenv "PYTHONPATH"))) + (python-path (getenv "GUIX_PYTHONPATH"))) (for-each (lambda (program) (wrap-program program `("PATH" ":" prefix (,path)) `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) - `("PYTHONPATH" ":" prefix (,python-path)))) + `("GUIX_PYTHONPATH" ":" prefix (,python-path)))) (map (lambda (name) (string-append out "/bin/" name)) '("analyze-pv-structure" @@ -506,9 +506,9 @@ photographic equipment.") ;; Ensure the OpenEXR headers are found. (setenv "CPATH" - (string-append (assoc-ref inputs "ilmbase") - "/include/OpenEXR:" (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-directory inputs "include/OpenEXR") + ":" (or (getenv "CPATH") ""))))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") @@ -657,10 +657,10 @@ such as Batch image processing.") (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (gi-typelib-path (getenv "GI_TYPELIB_PATH")) - (python-path (getenv "PYTHONPATH"))) + (python-path (getenv "GUIX_PYTHONPATH"))) (wrap-program (string-append out "/bin/entangle") `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) - `("PYTHONPATH" ":" prefix (,python-path)))) + `("GUIX_PYTHONPATH" ":" prefix (,python-path)))) #t))))) (native-inputs `(("cmake" ,cmake) |