diff options
| author | Marius Bakke <marius@gnu.org> | 2022-08-11 23:36:10 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-08-11 23:36:10 +0200 |
| commit | 77eb3008e350c069e0ae8df6a91bf0ebdcfc2ac0 (patch) | |
| tree | b899e65aa79099be3f4b27dfcd565bb143681211 /gnu/packages/image-processing.scm | |
| parent | f7e8be231806a904e6817e8ab3404b32f2511db2 (diff) | |
| parent | b50eaa67642ebc25e9c896f2e700c08610e0a5da (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/image-processing.scm')
| -rw-r--r-- | gnu/packages/image-processing.scm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index bcb1d7a2f6..3dfe086af8 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -358,6 +358,7 @@ many popular formats.") "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON" + "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" ; For F3D "-DVTK_WRAP_PYTHON=ON" "-DVTK_PYTHON_VERSION:STRING=3" ) @@ -770,7 +771,7 @@ including 2D color images.") (add-after 'unpack 'qt-chdir (lambda _ (chdir "gmic-qt") #t)))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (modify-inputs (package-inputs gmic) (prepend gmic qtbase-5))) @@ -1091,7 +1092,7 @@ combine the information contained in both.") ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins")) - '("qtbase" "qtdeclarative")))))))))) + '("qtbase" "qtdeclarative-5")))))))))) (inputs (list curl fftw @@ -1104,12 +1105,12 @@ combine the information contained in both.") insight-toolkit-4.12 vtk-7 qtbase-5 - qtdeclarative + qtdeclarative-5 vxl-1 zlib)) (native-inputs `(("googletest" ,googletest) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("pkg-config" ,pkg-config) ("c3d-src" ,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3") @@ -1224,14 +1225,14 @@ substituted by matching images.") "0kixwjb2x457dq7927hkh34c803p7yh1pmn6n61rk9shqrcg492h")))) (build-system qt-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs `(("boost" ,boost) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("zlib" ,zlib))) (arguments `(#:phases |