diff options
author | Anthony Cowley <acowley@gmail.com> | 2018-07-18 20:05:15 -0400 |
---|---|---|
committer | Anthony Cowley <acowley@gmail.com> | 2018-07-18 20:05:15 -0400 |
commit | 6690ec57f85e9e4ee4a840f06c0e63b6ecc9e201 (patch) | |
tree | bd15a6ade3c155092277c9edaed2f7a60289dddd /pkgs/applications/graphics | |
parent | dae9cf6106da19f79a39714f183ed253c62b32c5 (diff) |
paraview: 5.4.1 -> 5.5.2
This update should also fix the build the hydra: one part of the change is to build paraview with Qt-5.9, as this is the configuration that paraview upstream supports.
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index e5385c7528040..1d9956245a63e 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper stdenv.mkDerivation rec { name = "paraview-${version}"; - version = "5.4.1"; + version = "5.5.2"; # fetching from GitHub instead of taking an "official" source # tarball because of missing submodules there @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74"; + sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j"; fetchSubmodules = true; }; @@ -22,13 +22,14 @@ stdenv.mkDerivation rec { "-DPARAVIEW_ENABLE_PYTHON=ON" "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" + "-DOpenGL_GL_PREFERENCE=GLVND" ]; # During build, binaries are called that rely on freshly built # libraries. These reside in build/lib, and are not found by # default. preBuild = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib ''; enableParallelBuilding = true; |