glsurf: use ocamlPackages_4_05

Update to somewhat newer OCaml, so we can hopefully retire older sets in
the future.
This commit is contained in:
sternenseemann 2021-04-27 00:40:49 +02:00 committed by Alyssa Ross
parent 638e73de83
commit ba01fb866a
2 changed files with 27 additions and 8 deletions

View file

@ -1,7 +1,12 @@
{ lib, stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut, giflib { lib, stdenv, fetchurl, ocamlPackages, makeWrapper
, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng , libGLU, libGL, freeglut, mpfr, gmp
, pkgsHostTarget
}: }:
let
inherit (pkgsHostTarget.targetPackages.stdenv) cc;
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "glsurf-3.3.1"; name = "glsurf-3.3.1";
@ -10,17 +15,32 @@ stdenv.mkDerivation {
sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
}; };
buildInputs = [ freeglut libGLU libGL libmysqlclient mpfr giflib gmp nativeBuildInputs = [
libtiff libjpeg libpng ] makeWrapper
++ (with ocamlPackages; [ ] ++ (with ocamlPackages; [
ocaml findlib ocaml_mysql lablgl camlimages_4_1_2 mlgmpidl ocaml findlib
]); ]);
buildInputs = [
freeglut libGL libGLU mpfr gmp
] ++ (with ocamlPackages; [
camlp4 lablgl camlimages_4_2_4
]);
postPatch = ''
for f in callbacks*/Makefile src/Makefile; do
substituteInPlace "$f" --replace "+camlp4" \
"${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4"
done
'';
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/share/doc/glsurf mkdir -p $out/bin $out/share/doc/glsurf
cp ./src/glsurf.opt $out/bin/glsurf cp ./src/glsurf.opt $out/bin/glsurf
cp ./doc/doc.pdf $out/share/doc/glsurf cp ./doc/doc.pdf $out/share/doc/glsurf
cp -r ./examples $out/share/doc/glsurf cp -r ./examples $out/share/doc/glsurf
wrapProgram "$out/bin/glsurf" --set CC "${cc}/bin/${cc.targetPrefix}cc"
''; '';
meta = { meta = {

View file

@ -15283,8 +15283,7 @@ in
glpk = callPackage ../development/libraries/glpk { }; glpk = callPackage ../development/libraries/glpk { };
glsurf = callPackage ../applications/science/math/glsurf { glsurf = callPackage ../applications/science/math/glsurf {
libpng = libpng12; ocamlPackages = ocaml-ng.ocamlPackages_4_05;
ocamlPackages = ocaml-ng.ocamlPackages_4_01_0;
}; };
glui = callPackage ../development/libraries/glui {}; glui = callPackage ../development/libraries/glui {};