Fixes coq-8.3: requires OCaml 3.12

This commit is contained in:
Vincent Laporte 2014-09-17 23:44:02 +01:00
parent 55d5747a90
commit d67588a5f1
2 changed files with 48 additions and 3 deletions

View File

@ -0,0 +1,37 @@
{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "lablgtk";
version = "2.14.0";
in
stdenv.mkDerivation (rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://forge.ocamlcore.org/frs/download.php/561/${name}.tar.gz";
sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
};
buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview];
configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
buildFlags = "world";
preInstall = ''
mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib
export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH
'';
meta = {
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.roconnor
];
homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html;
description = "LablGTK is is an Objective Caml interface to gtk+";
license = stdenv.lib.licenses.lgpl21Plus;
};
})

View File

@ -3372,10 +3372,17 @@ let
lablgl = callPackage ../development/ocaml-modules/lablgl { }; lablgl = callPackage ../development/ocaml-modules/lablgl { };
lablgtk = callPackage ../development/ocaml-modules/lablgtk { lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix {
inherit (gnome) libgnomecanvas libglade gtksourceview; inherit (gnome) libgnomecanvas libglade gtksourceview;
}; };
lablgtk =
if lib.strings.versionAtLeast (builtins.parseDrvName ocaml.name).version "3.12"
then callPackage ../development/ocaml-modules/lablgtk {
inherit (gnome) libgnomecanvas libglade gtksourceview;
}
else lablgtk_2_14;
lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview { lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview {
gtkmathview = callPackage ../development/libraries/gtkmathview { }; gtkmathview = callPackage ../development/libraries/gtkmathview { };
}; };
@ -11242,8 +11249,9 @@ let
}; };
coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
inherit (ocamlPackages) findlib lablgtk; inherit (ocamlPackages_3_12_1) ocaml findlib;
camlp5 = ocamlPackages.camlp5_transitional; camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;
}; };
cvc3 = callPackage ../applications/science/logic/cvc3 {}; cvc3 = callPackage ../applications/science/logic/cvc3 {};