From 02682e509389a6de23a2614da3b43abebf45a4f2 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Sat, 22 Apr 2017 13:33:09 -0500 Subject: ocamlPackages.ocaml_lwt: use buildOcaml This adds the shared objects setup hook to prepare CAML_LD_LIBRARY_PATH. --- pkgs/development/ocaml-modules/lwt/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 53d5a25a39eb..d450a877517e 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 +{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 , ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib , ppx_tools, result, cppo , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" @@ -15,8 +15,8 @@ let param = }; in -stdenv.mkDerivation rec { - name = "ocaml-lwt-${version}"; +buildOcaml rec { + name = "lwt"; inherit (param) version; src = fetchzip { @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; + hasSharedObjects = true; + meta = with stdenv.lib; { homepage = http://ocsigen.org/lwt; description = "Lightweight thread library for Objective Caml"; -- cgit 1.4.1