ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4815 from vbgl/lwt

Browse Source 
ocaml-lwt: fixes build with OCaml 3.12 and 4.02
This commit is contained in:
cillianderoiste 2014-11-04 09:41:16 +01:00
commit 7e5eea005a
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/ocaml-modules/lwt/default.nix
View File

@ -1,7 +1,9 @@
{stdenv, fetchgit, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib}:
{stdenv, fetchgit, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4}:
let
version = "2.4.5";
inherit (stdenv.lib) optional getVersion versionAtLeast;
ocaml_version = getVersion ocaml;
in
stdenv.mkDerivation {
@ -15,21 +17,22 @@ stdenv.mkDerivation {
sha256 = "2bbf4f216dd62eeb765a89413f3b2b6d417a9c289ca49d595bb4d7a0545e343e";
};
buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses];
buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses camlp4];
propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text ];
configureFlags = [ "--enable-all" ];
configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" ]
++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel";
createFindlibDestdir = true;
meta = {
meta = with stdenv.lib; {
homepage = http://ocsigen.org/lwt;
description = "Lightweight thread library for Objective Caml";
license = "LGPL";
license = licenses.lgpl21;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z stdenv.lib.maintainers.gal_bolle
maintainers = with maintainers; [
z77z vbgl gal_bolle
];
};
}