diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-12-01 16:50:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-01 16:50:13 +0000 |
commit | 20fb2f8fd87ce3c9609b8b1b65ca1c2df4458b76 (patch) | |
tree | be10762ae096efed928a5d14365fbfa7a009eb75 /pkgs/applications | |
parent | aa5fa2f7cdc935b62d21b84d2f499282a77c67f4 (diff) | |
parent | fcd16d3338e1fd036121cb6afe5c094b9b9e0b75 (diff) | |
download | nixlib-20fb2f8fd87ce3c9609b8b1b65ca1c2df4458b76.tar nixlib-20fb2f8fd87ce3c9609b8b1b65ca1c2df4458b76.tar.gz nixlib-20fb2f8fd87ce3c9609b8b1b65ca1c2df4458b76.tar.bz2 nixlib-20fb2f8fd87ce3c9609b8b1b65ca1c2df4458b76.tar.lz nixlib-20fb2f8fd87ce3c9609b8b1b65ca1c2df4458b76.tar.xz nixlib-20fb2f8fd87ce3c9609b8b1b65ca1c2df4458b76.tar.zst nixlib-20fb2f8fd87ce3c9609b8b1b65ca1c2df4458b76.zip |
Merge pull request #32229 from bkchr/paraview
paraview: 5.4.0 -> 5.4.1
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 730f809eef40..8b532a7ad44f 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -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 - - # theoretically the following should be fine, but there is an error - # due to missing libqminimal when not using qt5.full - - # qtbase qtx11extras qttools - full - ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + python + mesa + libXt + qtbase + qtx11extras + qttools + qtxmlpatterns + ]; meta = { |