Syzygial/ccpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openfoam: Namespace conflict with point due to newer CGAL library

Browse Source
This commit is contained in:
Tyson Whitehead
2019-05-08 13:39:49 -04:00
parent 73d08ba015
commit d21031cf2a
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/all-packages.nix
View File

@@ -32,7 +32,7 @@ self: super: pkgs: with pkgs; {
octopus7 = octopus72; octopus7 = octopus72;
octopus = octopus7; octopus = octopus7;
openfoam = callPackage ./openfoam.nix { }; openfoam = callPackage ./openfoam { };
openslide = callPackage ./openslide { }; openslide = callPackage ./openslide { };

2
pkgs/openfoam.nix → pkgs/openfoam/default.nix
View File

@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0jfzc561ra1wzg8wbp5ipp1r5r1qg84krhmcvi8injqkl4svxbkk"; sha256 = "0jfzc561ra1wzg8wbp5ipp1r5r1qg84krhmcvi8injqkl4svxbkk";
}; };
patches = [ ./newer-cgal.patch ];
# a lot of assumptions about being under a directory named OpenFOAM-${version} # a lot of assumptions about being under a directory named OpenFOAM-${version}
postUnpack = '' postUnpack = ''
echo "resettting sourceRoot to ''${sourceRoot/-4.x-version/}" echo "resettting sourceRoot to ''${sourceRoot/-4.x-version/}"

10
pkgs/openfoam/newer-cgal.patch Normal file
View File

@@ -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