diff options
author | Jakub Kądziołka <[email protected]> | 2020-04-29 11:08:42 +0200 |
---|---|---|
committer | Jakub Kądziołka <[email protected]> | 2020-04-29 11:08:42 +0200 |
commit | 4035c3e3525599c3aa958d498c5bc789a4adffc3 (patch) | |
tree | e55a02215fcdb635d0504fc129526bfbf66abd14 /gnu/packages/image-processing.scm | |
parent | 492b82bd4d592276e65c4b9bfbe1b679a00ff09f (diff) | |
parent | 4f0f46e4af0e342d84c5ad448258702029601e4b (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image-processing.scm')
-rw-r--r-- | gnu/packages/image-processing.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index f5d67c8917..02d903a6a3 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Björn Höfling <[email protected]> ;;; Copyright © 2018 Lprndn <[email protected]> ;;; Copyright © 2019 Efraim Flashner <[email protected]> +;;; Copyright © 2020 Vincent Legoll <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -798,11 +799,11 @@ combine the information contained in both.") ("vtk" ,vtk-6) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) - ("qttools" ,qttools) ("vxl" ,vxl-1) ("zlib" ,zlib))) (native-inputs `(("googletest" ,googletest) + ("qttools" ,qttools) ("pkg-config" ,pkg-config) ("c3d-src" ,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3") |