JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #43786 from acowley/paraview-5.5.2

Browse Source 
paraview: 5.4.1 -> 5.5.2
This commit is contained in:
Sarah Brofeldt 2018-07-20 15:10:49 +02:00 committed by GitHub
commit ce7ff54ceb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/graphics/paraview/default.nix
View File

@ -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;

2
pkgs/top-level/all-packages.nix
View File

@ -17704,7 +17704,7 @@ with pkgs;
pavucontrol = callPackage ../applications/audio/pavucontrol { };
paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
paraview = libsForQt59.callPackage ../applications/graphics/paraview { };
packet = callPackage ../development/tools/packet { };