From bbf96f865286f87bbff9bc6679f4ee9c2584ad53 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 29 Jul 2018 13:32:04 +0000
Subject: ocamlPackages.asn1-combinators: remove spurious dependency to Camlp4

---
 pkgs/development/ocaml-modules/asn1-combinators/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index 78102b9c673b..c6d99fa33e71 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild
 , cstruct, zarith, ounit, result, topkg, ptime
 }:
 
@@ -10,16 +10,14 @@ let param =
   } else {
     version = "0.1.3";
     sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj";
-  propagatedBuildInputs = [ ];
+    propagatedBuildInputs = [ ];
   };
 in
 
-buildOcaml rec {
-  name = "asn1-combinators";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-asn1-combinators-${version}";
   inherit (param) version;
 
-  minimumSupportedOcamlVersion = "4.01";
-
   src = fetchFromGitHub {
     owner  = "mirleft";
     repo   = "ocaml-asn1-combinators";
@@ -27,7 +25,7 @@ buildOcaml rec {
     inherit (param) sha256;
   };
 
-  buildInputs = [ ocaml findlib ounit topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild ounit topkg ];
   propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs;
 
   buildPhase = "${topkg.run} build --tests true";
-- 
cgit 1.4.1