summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Brugger <brugger1@llnl.gov>2021-10-14 21:58:43 -0700
committerGitHub <noreply@github.com>2021-10-15 06:58:43 +0200
commitea453db674b08b85f0f03bd47363453832bd21fb (patch)
tree6ccc7c3030784c14ed84eb69d8aed6c196bda02f
parent41d375f6a47d94b59e7a48e8a8033eb1e4749aff (diff)
downloadspack-ea453db674b08b85f0f03bd47363453832bd21fb.tar.gz
spack-ea453db674b08b85f0f03bd47363453832bd21fb.tar.bz2
spack-ea453db674b08b85f0f03bd47363453832bd21fb.tar.xz
spack-ea453db674b08b85f0f03bd47363453832bd21fb.zip
vtk: modify conflict between osmesa and qt (#26752)
-rw-r--r--var/spack/repos/builtin/packages/vtk/package.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py
index d3513f385b..f33bdce640 100644
--- a/var/spack/repos/builtin/packages/vtk/package.py
+++ b/var/spack/repos/builtin/packages/vtk/package.py
@@ -50,9 +50,8 @@ class Vtk(CMakePackage):
patch('https://gitlab.kitware.com/vtk/vtk/-/commit/e066c3f4fbbfe7470c6207db0fc3f3952db633c.diff',
when="@9:", sha256='0546696bd02f3a99fccb9b7c49533377bf8179df16d901cefe5abf251173716d')
- # At the moment, we cannot build with both osmesa and qt, but as of
- # VTK 8.1, that should change
- conflicts('+osmesa', when='+qt')
+ # We cannot build with both osmesa and qt prior to VTK 8.1
+ conflicts('+osmesa', when='@:8.0 +qt')
extends('python', when='+python')