From ecb268b423e5b1a095207b19408437006578eecc Mon Sep 17 00:00:00 2001
From: Tyson Whitehead <twhitehead@gmail.com>
Date: Tue, 26 Jan 2021 19:28:04 -0500
Subject: [PATCH] ovito: 2.9.0 -> 3.3.5 (older openssl depedency may be
 insecure)

---
 pkgs/all-packages.nix                 |  2 +-
 pkgs/{ovito/default.nix => ovito.nix} | 10 ++++------
 pkgs/ovito/header-file.patch          | 25 -------------------------
 3 files changed, 5 insertions(+), 32 deletions(-)
 rename pkgs/{ovito/default.nix => ovito.nix} (73%)
 delete mode 100644 pkgs/ovito/header-file.patch

diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix
index 03f9619..f54a44a 100644
--- a/pkgs/all-packages.nix
+++ b/pkgs/all-packages.nix
@@ -34,7 +34,7 @@ self: super: pkgs: with pkgs; {
 
   openslide = callPackage ./openslide { };
 
-  ovito = libsForQt5.callPackage ./ovito { stdenv = overrideCC stdenv gcc6; };
+  ovito = libsForQt5.callPackage ./ovito.nix { libav = libav_12; };
 
   pythonOverrides = lib.composeExtensions super.pythonOverrides (import ./python-packages.nix pkgs);
 
diff --git a/pkgs/ovito/default.nix b/pkgs/ovito.nix
similarity index 73%
rename from pkgs/ovito/default.nix
rename to pkgs/ovito.nix
index 8f973b5..668c151 100644
--- a/pkgs/ovito/default.nix
+++ b/pkgs/ovito.nix
@@ -1,27 +1,25 @@
 { stdenv, fetchFromGitLab, cmake
-, boost, netcdf, hdf5, fftwSinglePrec, muparser, botan, libav, python
+, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, libav, python
 , qtbase, qtsvg, qttools, qscintilla }:
 
 stdenv.mkDerivation rec {
-  version = "2.9.0";
+  version = "3.3.5";
   name = "ovita-${version}";
 
   src = fetchFromGitLab {
     owner = "stuko";
     repo = "ovito";
     rev = "v${version}";
-    sha256 = "0yvz0aqw0ynhv9iychk9sdq54njw3lw61cdxv8295csjzx3nyvy3";
+    sha256 = "016kc5qh1jg8xryjhizjx67pkdpirgnfwi2i92glclqimln6vnns";
   };
 
-  patches = [ ./header-file.patch ];
-
   buildInputs = [
     cmake
     boost
     netcdf hdf5
     fftwSinglePrec
     muparser
-    botan
+    openssl
     libav
     python
     qtbase qtsvg qttools qscintilla
diff --git a/pkgs/ovito/header-file.patch b/pkgs/ovito/header-file.patch
deleted file mode 100644
index 7c46272..0000000
--- a/pkgs/ovito/header-file.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f7d4388dab9fafe04b01104be0d8e8956e4f712e Mon Sep 17 00:00:00 2001
-From: Tyson Whitehead <twhitehead@gmail.com>
-Date: Wed, 1 May 2019 16:58:11 -0400
-Subject: [PATCH] Header file was included by parent cpp (but not newer moc
- outputs?)
-
----
- src/plugins/particles/gui/objects/SimulationCellObjectEditor.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/plugins/particles/gui/objects/SimulationCellObjectEditor.h b/src/plugins/particles/gui/objects/SimulationCellObjectEditor.h
-index f095938c..a3b2e0ee 100755
---- a/src/plugins/particles/gui/objects/SimulationCellObjectEditor.h
-+++ b/src/plugins/particles/gui/objects/SimulationCellObjectEditor.h
-@@ -24,6 +24,7 @@
- 
- #include <plugins/particles/gui/ParticlesGui.h>
- #include <gui/properties/PropertiesEditor.h>
-+#include <gui/properties/BooleanParameterUI.h>
- 
- namespace Ovito { namespace Particles { OVITO_BEGIN_INLINE_NAMESPACE(Internal)
- 
--- 
-2.18.1
-