Unverified Commit c34b1985 authored by Reno Dakota's avatar Reno Dakota
Browse files

openscad: unpin cgal_4; fix darwin

parent 9f579229

pkgs/applications/graphics/openscad/default.nix

+23 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  libGL,

  glew,

  opencsg,

  cgal_4,

  cgal,

  mpfr,

  gmp,

  glib,
@@ -62,11 +62,32 @@ mkDerivation rec { 
      url = "https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b.patch";

      sha256 = "sha256-KNEVu10E2d4G2x+FJcuHo2tjD8ygMRuhUcW9NbN98bM=";

    })

    (fetchpatch {

      # needed for cgal_5

      name = "cgalutils-tess.cc-cgal-5.patch";

      url = "https://github.com/openscad/openscad/commit/3a81c1fb9b663ebbedd6eb044e7276357b1f30a1.patch";

      hash = "sha256-JdBznXkewx5ybY92Ss0h7UnMZ7d3IQbFRaDCDjb1bRA=";

    })

    (fetchpatch {

      # needed for cgal_5

      name = "cgalutils-tess.cc-cgal-5_4.patch";

      url = "https://github.com/openscad/openscad/commit/71f2831c0484c3f35cbf44e1d1dc2c857384100b.patch";

      hash = "sha256-Fu8dnjNIwZKCI6ukOeHYK8NiJwoA0XtqT8dg8sVevG8=";

    })

    (fetchpatch {

      # needed for cgal_5. Removes dead code

      name = "cgalutils-polyhedron.cc-cgal-5_3.patch";

      url = "https://github.com/openscad/openscad/commit/cc49ad8dac24309f5452d5dea9abd406615a52d9.patch";

      hash = "sha256-B3i+o6lR5osRcVXTimDZUFQmm12JhmbFgG9UwOPebF4=";

    })

  ];



  postPatch = ''

    substituteInPlace src/FileModule.cc \

      --replace-fail 'fs::is_regular' 'fs::is_regular_file'



    substituteInPlace src/openscad.cc \

      --replace-fail 'boost::join' 'boost::algorithm::join'

  '';



  nativeBuildInputs = [
@@ -84,7 +105,7 @@ mkDerivation rec { 
      boost

      glew

      opencsg

      cgal_4

      cgal

      mpfr

      gmp

      glib