diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:16:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:17:42 +0200 |
| commit | ef41fc7f5140a6d980faf7ed2a865ec2f092253b (patch) | |
| tree | 81bcfcc47155b56618dd73934ba41d8d8c7fc309 /pkgs/development/ocaml-modules/lwt | |
| parent | 656a0089f68495cd42d3164ed85d22ceec630d82 (diff) | |
| parent | 893df17c5a37e14616a24e66d96f3fd5e0344bce (diff) | |
| download | nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.gz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.bz2 nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.lz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.xz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.zst nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1399476
Diffstat (limited to 'pkgs/development/ocaml-modules/lwt')
| -rw-r--r-- | pkgs/development/ocaml-modules/lwt/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 262fef763d89..c3acdcf5bdb4 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,5 +1,5 @@ { stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 -, react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib +, react, ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib , ppx_tools, result, cppo , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" @@ -31,7 +31,7 @@ buildOcaml rec { ++ stdenv.lib.optional ppxSupport ppx_tools; propagatedBuildInputs = [ result ] - ++ optionals [ react ocaml_ssl ] + ++ optionals [ react ssl ] ++ [ libev ]; configureScript = "ocaml setup.ml -configure"; |