ovito: Missing include in header (exposed by newer qt moc?)
This commit is contained in:
@@ -36,7 +36,7 @@ self: super: pkgs: with pkgs; {
|
|||||||
|
|
||||||
openslide = callPackage ./openslide { };
|
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);
|
pythonOverrides = lib.composeExtensions super.pythonOverrides (import ./python-packages.nix pkgs);
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0yvz0aqw0ynhv9iychk9sdq54njw3lw61cdxv8295csjzx3nyvy3";
|
sha256 = "0yvz0aqw0ynhv9iychk9sdq54njw3lw61cdxv8295csjzx3nyvy3";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./header-file.patch ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
cmake
|
cmake
|
||||||
boost
|
boost
|
||||||
25
pkgs/ovito/header-file.patch
Normal file
25
pkgs/ovito/header-file.patch
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
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
|
||||||
|
|
||||||
Reference in New Issue
Block a user