diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-12-31 11:04:51 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-12-31 11:04:51 +0100 |
| commit | ce9383c090fff90acb3a555d0ccfe12d791fef17 (patch) | |
| tree | 7b9cce156799486b94e4f3e55b03831638e73465 /gnu/packages/photo.scm | |
| parent | 91be09de61c277d0f1b26cefcefcd0a7fae2e00d (diff) | |
| parent | fc4eb87dc45b169e3912c73bbf60cb8ce76b7c7c (diff) | |
| download | guix-ce9383c090fff90acb3a555d0ccfe12d791fef17.tar guix-ce9383c090fff90acb3a555d0ccfe12d791fef17.tar.gz | |
Merge remote-tracking branch 'master' into core-updates.
Diffstat (limited to 'gnu/packages/photo.scm')
| -rw-r--r-- | gnu/packages/photo.scm | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index f6d86f0857..0867433245 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -361,7 +361,7 @@ photographic equipment.") (define-public darktable (package (name "darktable") - (version "2.6.2") + (version "2.6.3") (source (origin (method url-fetch) @@ -369,27 +369,25 @@ photographic equipment.") "https://github.com/darktable-org/darktable/releases/" "download/release-" version "/darktable-" version ".tar.xz")) (sha256 - (base32 "0igvgyd042j7hm4y8fcm6dc1qqjs4d1r7y6f0pzpa0x416xyzfcw")))) + (base32 "1w3q3dhcxa0bs590zbsj61ap8z84wmn04xs5q3gjwisqhjf9j655")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests #:configure-flags '("-DBINARY_PACKAGE_BUILD=On") - #:make-flags - (list - (string-append "CPATH=" (assoc-ref %build-inputs "ilmbase") - "/include/OpenEXR:" (or (getenv "CPATH") ""))) #:phases (modify-phases %standard-phases - (add-before 'configure 'set-ldflags - (lambda* (#:key outputs #:allow-other-keys) + (add-before 'configure 'set-LDFLAGS-and-CPATH + (lambda* (#:key inputs 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") ""))) #t))))) - (native-inputs - `(("llvm" ,llvm-3.9.1) - ("clang" ,clang-3.9.1))) (inputs `(("libxslt" ,libxslt) ("libxml2" ,libxml2) |