alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #219604 from wegank/glsurf-ocaml

Browse source 
glsurf: migrate to OCaml 4.14
This commit is contained in:
Weijia Wang 2023-03-06 11:05:05 +02:00 committed by GitHub
parent 4f7c3679d3 a56529a95f
commit 55bb9cd6c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/science/math/glsurf/default.nix
View file

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

4
pkgs/top-level/all-packages.nix
View file

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