From d21031cf2ab62fc99ebb75deacbde6f4068a851b Mon Sep 17 00:00:00 2001
From: Tyson Whitehead <twhitehead@gmail.com>
Date: Wed, 8 May 2019 13:39:49 -0400
Subject: [PATCH] openfoam: Namespace conflict with point due to newer CGAL
 library

---
 pkgs/all-packages.nix                       |  2 +-
 pkgs/{openfoam.nix => openfoam/default.nix} |  2 ++
 pkgs/openfoam/newer-cgal.patch              | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 rename pkgs/{openfoam.nix => openfoam/default.nix} (98%)
 create mode 100644 pkgs/openfoam/newer-cgal.patch

diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix
index 4b1f9cf..2190252 100644
--- a/pkgs/all-packages.nix
+++ b/pkgs/all-packages.nix
@@ -32,7 +32,7 @@ self: super: pkgs: with pkgs; {
   octopus7 = octopus72;
   octopus = octopus7;
 
-  openfoam = callPackage ./openfoam.nix { };
+  openfoam = callPackage ./openfoam { };
 
   openslide = callPackage ./openslide { };
 
diff --git a/pkgs/openfoam.nix b/pkgs/openfoam/default.nix
similarity index 98%
rename from pkgs/openfoam.nix
rename to pkgs/openfoam/default.nix
index a785fe1..6bf18e7 100644
--- a/pkgs/openfoam.nix
+++ b/pkgs/openfoam/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
      sha256 = "0jfzc561ra1wzg8wbp5ipp1r5r1qg84krhmcvi8injqkl4svxbkk";
   };
 
+  patches = [ ./newer-cgal.patch ];
+
   # a lot of assumptions about being under a directory named OpenFOAM-${version}
   postUnpack = ''
     echo "resettting sourceRoot to ''${sourceRoot/-4.x-version/}"
diff --git a/pkgs/openfoam/newer-cgal.patch b/pkgs/openfoam/newer-cgal.patch
new file mode 100644
index 0000000..c0234f4
--- /dev/null
+++ b/pkgs/openfoam/newer-cgal.patch
@@ -0,0 +1,10 @@
+--- OpenFOAM-4.0/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H_	2019-05-08 12:06:37.310401266 -0400
++++ OpenFOAM-4.0/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H	2019-05-08 12:07:12.582103107 -0400
+@@ -150,6 +150,7 @@
+ {
+ 
+ private:
++    typedef Foam::point point;
+ 
+     // Private data
+