Merge pull request #43786 from acowley/paraview-5.5.2

paraview: 5.4.1 -> 5.5.2

authored by Sarah Brofeldt and committed by GitHub ce7ff54c 871f3396

+5 -4
+4 -3
pkgs/applications/graphics/paraview/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 name = "paraview-${version}"; 9 - version = "5.4.1"; 9 + version = "5.5.2"; 10 10 11 11 # fetching from GitHub instead of taking an "official" source 12 12 # tarball because of missing submodules there ··· 14 14 owner = "Kitware"; 15 15 repo = "ParaView"; 16 16 rev = "v${version}"; 17 - sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74"; 17 + sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j"; 18 18 fetchSubmodules = true; 19 19 }; 20 20 ··· 22 22 "-DPARAVIEW_ENABLE_PYTHON=ON" 23 23 "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" 24 24 "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" 25 + "-DOpenGL_GL_PREFERENCE=GLVND" 25 26 ]; 26 27 27 28 # During build, binaries are called that rely on freshly built 28 29 # libraries. These reside in build/lib, and are not found by 29 30 # default. 30 31 preBuild = '' 31 - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib 32 + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib 32 33 ''; 33 34 34 35 enableParallelBuilding = true;
+1 -1
pkgs/top-level/all-packages.nix
··· 17704 17704 17705 17705 pavucontrol = callPackage ../applications/audio/pavucontrol { }; 17706 17706 17707 - paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; 17707 + paraview = libsForQt59.callPackage ../applications/graphics/paraview { }; 17708 17708 17709 17709 packet = callPackage ../development/tools/packet { }; 17710 17710