diff options
Diffstat (limited to 'gnu/packages/photo.scm')
| -rw-r--r-- | gnu/packages/photo.scm | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 6364323731..34d9cc3dd0 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 <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il> @@ -41,6 +41,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages build-tools) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -156,13 +157,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" @@ -503,18 +504,12 @@ photographic equipment.") (substitute* "CMakeLists.txt" (("\\$\\{LLVM_INSTALL_PREFIX\\}") (assoc-ref %build-inputs "clang"))))) - (add-before 'configure 'set-LDFLAGS-and-CPATH - (lambda* (#:key inputs outputs #:allow-other-keys) + (add-before 'configure 'set-LDFLAGS + (lambda* (#:key 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") ""))))) + (assoc-ref outputs "out") "/lib/darktable")))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") @@ -549,7 +544,7 @@ photographic equipment.") ("graphicsmagick" ,graphicsmagick) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) - ("ilmbase" ,ilmbase) + ("imath" ,imath) ("iso-codes" ,iso-codes) ;optional, for language names in the preferences ("json-glib" ,json-glib) ("lcms" ,lcms) @@ -561,14 +556,14 @@ photographic equipment.") ("libpng" ,libpng) ("librsvg" ,librsvg) ("libsecret" ,libsecret) ;optional, for storing passwords - ("libsoup" ,libsoup) + ("libsoup" ,libsoup-minimal-2) ("libtiff" ,libtiff) ("libwebp" ,libwebp) ;optional, for WebP support ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("lua" ,lua) ;optional, for plugins ("opencl-icd-loader" ,opencl-icd-loader) ;optional, for OpenCL support - ("openexr" ,openexr-2) ;optional, for EXR import/export + ("openexr" ,openexr) ;optional, for EXR import/export ("openjpeg" ,openjpeg) ;optional, for JPEG2000 export ("osm-gps-map" ,osm-gps-map) ;optional, for geotagging view ("pugixml" ,pugixml) @@ -645,6 +640,7 @@ such as Batch image processing.") (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t + #:meson ,meson-0.59 ;fails to build with Meson 0.60 #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-gtk-update-icon-cache @@ -658,10 +654,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) @@ -799,7 +795,7 @@ a complete panorama and stitch any series of overlapping pictures.") ("glib" ,glib) ("glibmm" ,glibmm) ("gtk+" ,gtk+) - ("gtkmm" ,gtkmm) + ("gtkmm" ,gtkmm-3) ("lcms" ,lcms) ("lensfun" ,lensfun) ("libcanberra" ,libcanberra) |