From 24df641deba37fb6f9bed238f028052178721ac6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 12 Nov 2016 09:39:16 +0100
Subject: [PATCH] ocamlPackages.conduit: refactor

---
 pkgs/development/ocaml-modules/conduit/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
index 26accd99db6..afe44ea0a7f 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -1,5 +1,7 @@
-{stdenv, buildOcaml, fetchurl, sexplib_p4, stringext, uri, cstruct, ipaddr,
- async ? null, async_ssl ? null, lwt ? null}:
+{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri, cstruct, ipaddr
+, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
+, async_p4 ? null, async_ssl_p4 ? null, lwt ? null
+}:
 
 buildOcaml rec {
   name = "conduit";
@@ -10,10 +12,10 @@ buildOcaml rec {
     sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1";
   };
 
-  propagatedBuildInputs = ([ sexplib_p4 stringext uri cstruct ipaddr ]
-                            ++ stdenv.lib.optional (lwt != null) lwt
-                            ++ stdenv.lib.optional (async != null) async
-                            ++ stdenv.lib.optional (async_ssl != null) async_ssl);
+  propagatedBuildInputs = [ sexplib_p4 stringext uri cstruct ipaddr ];
+  buildInputs = stdenv.lib.optional (lwt != null) lwt
+             ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4
+             ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/mirage/ocaml-conduit;