Merge pull request #29214 from timor/paraview-5.4.0

ParaView: 4.0.1 -> 5.4.0

authored by Jörg Thalheim and committed by GitHub 5b29e35c 5522cd5c

+36 -30
+35 -29
pkgs/applications/graphics/paraview/default.nix
··· 1 - { fetchurl, stdenv, cmake, qt4 2 - , hdf5 3 - , mpich2 4 - , python 5 - , libxml2 6 - , mesa, libXt 7 - }: 1 + {stdenv, fetchFromGitHub, cmake 2 + ,full, python, mesa, libXt }: 8 3 9 4 stdenv.mkDerivation rec { 10 - name = "paraview-4.0.1"; 11 - src = fetchurl { 12 - url = "http://paraview.org/files/v4.0/ParaView-v4.0.1-source.tgz"; 13 - sha256 = "1qj8dq8gqpsw75sv4sdc7xm1xcpv0ilsddnrcfhha0zfhp0gq10y"; 5 + name = "paraview-${version}"; 6 + version = "5.4.0"; 7 + 8 + # fetching from GitHub instead of taking an "official" source 9 + # tarball because of missing submodules there 10 + src = fetchFromGitHub { 11 + owner = "Kitware"; 12 + repo = "ParaView"; 13 + rev = "v${version}"; 14 + sha256 = "0h1vkgwm10mc5mnr3djp81lxr5pi0hyj776z77hiib6xm5596q9n"; 15 + fetchSubmodules = true; 14 16 }; 15 17 16 - # [ 5%] Generating vtkGLSLShaderLibrary.h 17 - # ../../../bin/ProcessShader: error while loading shared libraries: libvtksys.so.pv3.10: cannot open shared object file: No such file or directory 18 - preConfigure = '' 19 - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.98 -rpath ../../../../../../lib -rpath ../../../../../lib -rpath ../../../../lib -rpath ../../../lib -rpath ../../lib -rpath ../lib" 20 - ''; 21 - cmakeFlags = [ 22 - "-DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON" 23 - "-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON" 24 - "-DPARAVIEW_ENABLE_PYTHON:BOOL=ON" 25 - # use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html 26 - "-DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF" 27 - "-DCMAKE_SKIP_BUILD_RPATH=ON" 28 - "-DVTK_USE_RPATH:BOOL=ON" 29 - "-DPARAVIEW_INSTALL_DEVELOPMENT=ON" 30 - ]; 18 + cmakeFlags = [ 19 + "-DPARAVIEW_ENABLE_PYTHON=ON" 20 + "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" 21 + ]; 31 22 32 - # https://bugzilla.redhat.com/show_bug.cgi?id=1138466 33 - NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; 23 + # During build, binaries are called that rely on freshly built 24 + # libraries. These reside in build/lib, and are not found by 25 + # default. 26 + preBuild = '' 27 + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib 28 + ''; 34 29 35 30 enableParallelBuilding = true; 36 31 37 - buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ]; 32 + buildInputs = [ cmake 33 + python 34 + mesa 35 + libXt 36 + 37 + # theoretically the following should be fine, but there is an error 38 + # due to missing libqminimal when not using qt5.full 39 + 40 + # qtbase qtx11extras qttools 41 + full 42 + ]; 43 + 38 44 39 45 meta = { 40 46 homepage = http://www.paraview.org/;
+1 -1
pkgs/top-level/all-packages.nix
··· 15729 15729 15730 15730 pavucontrol = callPackage ../applications/audio/pavucontrol { }; 15731 15731 15732 - paraview = callPackage ../applications/graphics/paraview { }; 15732 + paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; 15733 15733 15734 15734 packet = callPackage ../development/tools/packet { }; 15735 15735