openfoam: Namespace conflict with point due to newer CGAL library

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 { };
 

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/}"

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
+