diff options
| author | Marius Bakke <marius@gnu.org> | 2020-12-29 17:39:24 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-12-29 17:39:24 +0100 |
| commit | 78cf7a4571081ff9c9e4ab678bf67368de1add59 (patch) | |
| tree | d37341b9129f7ea1c6288f5095af2d046fb27710 /gnu/packages/photo.scm | |
| parent | afa493c4c7ef307455b16b52a87d180f0c4a8c6b (diff) | |
| parent | a22e75c073c785a3a71c952d97fb7ab87dfd282d (diff) | |
| download | guix-78cf7a4571081ff9c9e4ab678bf67368de1add59.tar.gz | |
Merge branch 'ungrafting' into staging
Diffstat (limited to 'gnu/packages/photo.scm')
| -rw-r--r-- | gnu/packages/photo.scm | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 677d0ed95e..5402826fd6 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cups) @@ -75,6 +76,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages sqlite) #:use-module (gnu packages tex) #:use-module (gnu packages time) @@ -467,7 +469,7 @@ photographic equipment.") (define-public darktable (package (name "darktable") - (version "3.2.1") + (version "3.4.0") (source (origin (method url-fetch) @@ -475,11 +477,11 @@ photographic equipment.") "https://github.com/darktable-org/darktable/releases/" "download/release-" version "/darktable-" version ".tar.xz")) (sha256 - (base32 "035rvqmw386hm0jpi14lf4dnpr5rjkalzjkyprqh42nwi3m86dkf")))) + (base32 "1nmx5lmhp7igav5pswqxmacsbnhgydgvxh1q53wlmyd9bqgxxlvd")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; there are no tests - #:configure-flags '("-DBINARY_PACKAGE_BUILD=On") + `(#:configure-flags '("-DBINARY_PACKAGE_BUILD=On" + "-DBUILD_TESTING=On") #:phases (modify-phases %standard-phases (add-before 'configure 'prepare-build-environment @@ -519,16 +521,19 @@ photographic equipment.") "/lib")))) #t))))) (native-inputs - `(("clang" ,clang-9) + `(("clang" ,clang-11) + ("cmocka" ,cmocka) ("desktop-file-utils" ,desktop-file-utils) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) - ("llvm" ,llvm-9) ;should match the Clang version + ("llvm" ,llvm-11) ;should match the Clang version ("opencl-headers" ,opencl-headers) ("perl" ,perl) ("pkg-config" ,pkg-config) - ("po4a" ,po4a))) + ("po4a" ,po4a) + ("python" ,python-wrapper) + ("ruby" ,ruby))) (inputs `(("cairo" ,cairo) ("colord-gtk" ,colord-gtk) ;optional, for color profile support |