Merge pull request #32229 from bkchr/paraview

paraview: 5.4.0 -> 5.4.1
This commit is contained in:
Jörg Thalheim 2017-12-01 16:50:13 +00:00 committed by GitHub
commit 20fb2f8fd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,9 +1,12 @@
{stdenv, fetchFromGitHub, cmake
,full, python, mesa, libXt }:
{
stdenv, fetchFromGitHub, cmake
,qtbase, qttools, python, mesa
,libXt, qtx11extras, qtxmlpatterns
}:
stdenv.mkDerivation rec {
name = "paraview-${version}";
version = "5.4.0";
version = "5.4.1";
# fetching from GitHub instead of taking an "official" source
# tarball because of missing submodules there
@ -11,13 +14,14 @@ stdenv.mkDerivation rec {
owner = "Kitware";
repo = "ParaView";
rev = "v${version}";
sha256 = "0h1vkgwm10mc5mnr3djp81lxr5pi0hyj776z77hiib6xm5596q9n";
sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74";
fetchSubmodules = true;
};
cmakeFlags = [
"-DPARAVIEW_ENABLE_PYTHON=ON"
"-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
"-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF"
];
# During build, binaries are called that rely on freshly built
@ -29,17 +33,19 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ cmake
python
mesa
libXt
nativeBuildInputs = [
cmake
];
# theoretically the following should be fine, but there is an error
# due to missing libqminimal when not using qt5.full
# qtbase qtx11extras qttools
full
];
buildInputs = [
python
mesa
libXt
qtbase
qtx11extras
qttools
qtxmlpatterns
];
meta = {