From cef755a8439b2c9f518725d2dcba73f2cae58123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Fri, 1 Dec 2017 13:20:15 +0100
Subject: [PATCH 1/2] paraview: 5.4.0 -> 5.4.1

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

diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 730f809eef4..9c5fe928f23 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 = {

From fcd16d3338e1fd036121cb6afe5c094b9b9e0b75 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Fri, 1 Dec 2017 12:49:52 +0000
Subject: [PATCH 2/2] paraview: cmake belongs to nativeBuildInputs

---
 pkgs/applications/graphics/paraview/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 9c5fe928f23..8b532a7ad44 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -1,7 +1,7 @@
 {
 stdenv, fetchFromGitHub, cmake
 ,qtbase, qttools, python, mesa
-,libXt, qtx11extras, qtxmlpatterns 
+,libXt, qtx11extras, qtxmlpatterns
 }:
 
 stdenv.mkDerivation rec {
@@ -33,8 +33,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ 
+  nativeBuildInputs = [
     cmake
+  ];
+
+  buildInputs = [
     python
     mesa
     libXt