From 4e47e8500584a6769ca4e8b0207f55d09222e803 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 25 Jan 2017 02:06:38 -0500
Subject: [PATCH] piqi: missed propagated dependency

---
 pkgs/development/ocaml-modules/piqi-ocaml/default.nix | 4 ++--
 pkgs/development/ocaml-modules/piqi/default.nix       | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index 488a13ecf16..165a566b1b7 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, base64, camlp4}:
+{ stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, camlp4 }:
 
 stdenv.mkDerivation rec {
   version = "0.7.5";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv";
   };
 
-  buildInputs = [ocaml findlib piqi base64 camlp4];
+  buildInputs = [ ocaml findlib piqi camlp4 ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index 273cd8f1862..f8126f91d87 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -9,13 +9,18 @@ stdenv.mkDerivation rec {
     sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l";
   };
 
-  buildInputs = [ocaml findlib camlp4 which ocaml_optcomp base64];
-  propagatedBuildInputs = [ulex xmlm easy-format];
+  buildInputs = [ocaml findlib camlp4 which ocaml_optcomp];
+  propagatedBuildInputs = [ulex xmlm easy-format base64];
 
   patches = [ ./no-ocamlpath-override.patch ];
 
   createFindlibDestdir = true;
 
+  buildPhase = ''
+    make
+    make -C piqilib piqilib.cma
+  '';
+
   installPhase = ''
     make install;
     make ocaml-install;