From 8be0a79790a96674d5342e857b659bb4b65c2737 Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Thu, 2 May 2019 11:35:42 -0400 Subject: [PATCH] ovito: Missing include in header (exposed by newer qt moc?) --- pkgs/all-packages.nix | 2 +- pkgs/{ovito.nix => ovito/default.nix} | 2 ++ pkgs/ovito/header-file.patch | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) rename pkgs/{ovito.nix => ovito/default.nix} (95%) create mode 100644 pkgs/ovito/header-file.patch diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix index 71a3565..4b1f9cf 100644 --- a/pkgs/all-packages.nix +++ b/pkgs/all-packages.nix @@ -36,7 +36,7 @@ self: super: pkgs: with pkgs; { openslide = callPackage ./openslide { }; - ovito = libsForQt5.callPackage ./ovito.nix { stdenv = overrideCC stdenv gcc6; }; + ovito = libsForQt5.callPackage ./ovito { stdenv = overrideCC stdenv gcc6; }; pythonOverrides = lib.composeExtensions super.pythonOverrides (import ./python-packages.nix pkgs); diff --git a/pkgs/ovito.nix b/pkgs/ovito/default.nix similarity index 95% rename from pkgs/ovito.nix rename to pkgs/ovito/default.nix index e712ace..8f973b5 100644 --- a/pkgs/ovito.nix +++ b/pkgs/ovito/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0yvz0aqw0ynhv9iychk9sdq54njw3lw61cdxv8295csjzx3nyvy3"; }; + patches = [ ./header-file.patch ]; + buildInputs = [ cmake boost diff --git a/pkgs/ovito/header-file.patch b/pkgs/ovito/header-file.patch new file mode 100644 index 0000000..7c46272 --- /dev/null +++ b/pkgs/ovito/header-file.patch @@ -0,0 +1,25 @@ +From f7d4388dab9fafe04b01104be0d8e8956e4f712e Mon Sep 17 00:00:00 2001 +From: Tyson Whitehead +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 + #include ++#include + + namespace Ovito { namespace Particles { OVITO_BEGIN_INLINE_NAMESPACE(Internal) + +-- +2.18.1 +