Unverified Commit 55bb9cd6 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #219604 from wegank/glsurf-ocaml 

glsurf: migrate to OCaml 4.14
parents 4f7c3679 a56529a9

pkgs/applications/science/math/glsurf/default.nix

+5 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec { 
  ] ++ (with ocamlPackages; [

    camlp4

    lablgl

    camlimages_4_2_4

    camlimages

    num

  ]);



  postPatch = ''
@@ -48,6 +49,9 @@ stdenv.mkDerivation rec { 
      substituteInPlace "$f" --replace "+camlp4" \

        "${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4"

    done



    # Fatal error: exception Sys_error("Mutex.unlock: Operation not permitted")

    sed -i "/gl_started/d" src/draw.ml* src/main.ml

  '';



  installPhase = ''

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -20179,7 +20179,9 @@ with pkgs; 
  glpk = callPackage ../development/libraries/glpk { };















  glsurf = callPackage ../applications/science/math/glsurf {













    ocamlPackages = ocaml-ng.ocamlPackages_4_05;













    ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override {













      unsafeStringSupport = true;













    });















  };





























  glui = callPackage ../development/libraries/glui {};