ocamlPackages.labltk: fix ocamlbrowser by wrapping

Also remove legacy versions
This commit is contained in:
Vincent Laporte 2021-04-14 08:09:20 +02:00 committed by Vincent Laporte
parent b3abdc9534
commit 1f1a77bdb7

View file

@ -1,46 +1,24 @@
{ stdenv, lib, fetchurl, fetchzip, ocaml, findlib, tcl, tk }: { stdenv, lib, makeWrapper, fetchzip, ocaml, findlib, tcl, tk }:
let OCamlVersionAtLeast = lib.versionAtLeast ocaml.version; in let
params =
if !OCamlVersionAtLeast "4.04" let mkNewParam = { version, sha256, rev ? version }: {
then throw "labltk is not available for OCaml ${ocaml.version}"
else
let param =
let mkNewParam = { version, sha256 }: {
inherit version; inherit version;
src = fetchzip { src = fetchzip {
url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; url = "https://github.com/garrigue/labltk/archive/${rev}.tar.gz";
inherit sha256; inherit sha256;
}; };
}; in }; in
let mkOldParam = { version, key, sha256 }: {
src = fetchurl {
url = "https://forge.ocamlcore.org/frs/download.php/${key}/labltk-${version}.tar.gz";
inherit sha256;
};
inherit version;
}; in
rec { rec {
"4.04" = mkOldParam { "4.06" = mkNewParam {
version = "8.06.2";
key = "1628";
sha256 = "1p97j9s33axkb4yyl0byhmhlyczqarb886ajpyggizy2br3a0bmk";
};
"4.05" = mkOldParam {
version = "8.06.3";
key = "1701";
sha256 = "1rka9jpg3kxqn7dmgfsa7pmsdwm16x7cn4sh15ijyyrad9phgdxn";
};
"4.06" = mkOldParam {
version = "8.06.4"; version = "8.06.4";
key = "1727"; rev = "labltk-8.06.4";
sha256 = "0j3rz0zz4r993wa3ssnk5s416b1jhj58l6z2jk8238a86y7xqcii"; sha256 = "03xwnnnahb2rf4siymzqyqy8zgrx3h26qxjgbp5dh1wdl7n02c7g";
}; };
"4.07" = mkOldParam { "4.07" = mkNewParam {
version = "8.06.5"; version = "8.06.5";
key = "1764"; rev = "1b71e2c6f3ae6847d3d5e79bf099deb7330fb419";
sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; sha256 = "02vchmrm3izrk7daldd22harhgrjhmbw6i1pqw6hmfmrmrypypg2";
}; };
_8_06_7 = mkNewParam { _8_06_7 = mkNewParam {
version = "8.06.7"; version = "8.06.7";
@ -60,14 +38,16 @@ let param =
version = "8.06.10"; version = "8.06.10";
sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a"; sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a";
}; };
}.${builtins.substring 0 4 ocaml.version}; };
param = params . ${lib.versions.majorMinor ocaml.version}
or (throw "labltk is not available for OCaml ${ocaml.version}");
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (param) version src; inherit (param) version src;
name = "ocaml${ocaml.version}-labltk-${version}"; name = "ocaml${ocaml.version}-labltk-${version}";
buildInputs = [ ocaml findlib tcl tk ]; buildInputs = [ ocaml findlib tcl tk makeWrapper ];
configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ];
dontAddPrefix = true; dontAddPrefix = true;
@ -79,6 +59,10 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
mkdir -p $OCAMLFIND_DESTDIR/stublibs mkdir -p $OCAMLFIND_DESTDIR/stublibs
mv $OCAMLFIND_DESTDIR/labltk/dlllabltk.so $OCAMLFIND_DESTDIR/stublibs/ mv $OCAMLFIND_DESTDIR/labltk/dlllabltk.so $OCAMLFIND_DESTDIR/stublibs/
for p in $out/bin/*
do
wrapProgram $p --set CAML_LD_LIBRARY_PATH $OCAMLFIND_DESTDIR/stublibs
done
''; '';
meta = { meta = {