From e5fa83e7f592eb56096affc52c6cc612e062bb5f Mon Sep 17 00:00:00 2001
From: Kirill Boltaev <aske@fmap.me>
Date: Sun, 25 Sep 2016 00:39:35 +0300
Subject: [PATCH] trv: explicitly specify camlp4 packages

---
 pkgs/development/tools/misc/trv/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix
index 606cc514647..c14a41cc559 100644
--- a/pkgs/development/tools/misc/trv/default.nix
+++ b/pkgs/development/tools/misc/trv/default.nix
@@ -1,5 +1,6 @@
-{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core, async, async_unix, re2,
-  async_extra, sexplib, async_shell, core_extended, async_find, cohttp, uri, tzdata}:
+{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4
+, re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find
+, cohttp, uri, tzdata}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -20,9 +21,9 @@ stdenv.mkDerivation {
 
 
   buildInputs = [ ocaml findlib camlp4 ];
-  propagatedBuildInputs = [ core async async_unix
-                            async_extra sexplib async_shell core_extended
-                            async_find cohttp uri re2 ];
+  propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4
+                            async_extra_p4 sexplib_p4 async_shell core_extended_p4
+                            async_find cohttp uri re2_p4 ];
 
   createFindlibDestdir = true;
   dontStrip = true;