Skip to content

Commit ee06b11

Browse files
timorMic92
authored andcommittedSep 22, 2017
ParaView: 4.0.1 -> 5.4.0
(cherry picked from commit 274333e)
1 parent e6ca475 commit ee06b11

File tree

2 files changed

+36
-30
lines changed

2 files changed

+36
-30
lines changed
 

Diff for: ‎pkgs/applications/graphics/paraview/default.nix

+35-29
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,46 @@
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 }:
83

94
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;
1416
};
1517

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"
18+
cmakeFlags = [
19+
"-DPARAVIEW_ENABLE_PYTHON=ON"
20+
"-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
21+
];
22+
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
2028
'';
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-
];
31-
32-
# https://bugzilla.redhat.com/show_bug.cgi?id=1138466
33-
NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
3429

3530
enableParallelBuilding = true;
3631

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+
3844

3945
meta = {
4046
homepage = http://www.paraview.org/;

Diff for: ‎pkgs/top-level/all-packages.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -15665,7 +15665,7 @@ with pkgs;
1566515665

1566615666
pavucontrol = callPackage ../applications/audio/pavucontrol { };
1566715667

15668-
paraview = callPackage ../applications/graphics/paraview { };
15668+
paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
1566915669

1567015670
packet = callPackage ../development/tools/packet { };
1567115671

0 commit comments

Comments
 (0)
Please sign in to comment.