From cef755a8439b2c9f518725d2dcba73f2cae58123 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <git@kchr.de>
Date: Fri, 1 Dec 2017 13:20:15 +0100
Subject: paraview: 5.4.0 -> 5.4.1

---
 pkgs/applications/graphics/paraview/default.nix | 33 ++++++++++++++-----------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'pkgs/applications/graphics')

diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 730f809eef40..9c5fe928f234 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,16 @@ 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
-   ];
+  buildInputs = [ 
+    cmake
+    python
+    mesa
+    libXt
+    qtbase
+    qtx11extras
+    qttools
+    qtxmlpatterns
+  ];
 
 
   meta = {
-- 
cgit 1.4.1