From 708bcdb307d57cbd1285b8c9bb1ca635f01a3951 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 4 Mar 2017 05:33:30 +0000 Subject: [PATCH] ocamlPackages.{angstrom,cstruct,ezjsonm,hex,io-page}: depend on ocamlbuild --- pkgs/development/ocaml-modules/angstrom/default.nix | 4 ++-- pkgs/development/ocaml-modules/cstruct/default.nix | 4 ++-- pkgs/development/ocaml-modules/ezjsonm/default.nix | 4 ++-- pkgs/development/ocaml-modules/hex/default.nix | 4 ++-- pkgs/development/ocaml-modules/io-page/default.nix | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index 56509ab5786a..755724bc8b82 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, cstruct, result, findlib, ocaml_oasis }: +{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib, ocaml_oasis }: stdenv.mkDerivation rec { version = "0.3.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildInputs = [ ocaml ocaml_oasis findlib ]; + buildInputs = [ ocaml ocaml_oasis findlib ocamlbuild ]; propagatedBuildInputs = [ result cstruct ]; meta = { diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 8c1aac4d83b2..eb148311be0b 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib, findlib, ppx_tools +{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools , async ? null, lwt ? null }: @@ -24,7 +24,7 @@ stdenv.mkDerivation { configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ]; - buildInputs = [ ocaml findlib ppx_tools lwt async ]; + buildInputs = [ ocaml findlib ocamlbuild ppx_tools lwt async ]; propagatedBuildInputs = [ ocplib-endian sexplib ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index 44d8ce393fbd..aec6851e12bc 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, jsonm, hex, sexplib, lwt }: let version = "0.4.3"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1y6p3ga6vj1wx5dyns7hjgd0qgrrn2hnn323a7y5didgci5pybls"; }; - buildInputs = [ ocaml findlib lwt ]; + buildInputs = [ ocaml findlib ocamlbuild lwt ]; propagatedBuildInputs = [ jsonm hex sexplib ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index 07b7773ff2c7..56d5e07f1d19 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, cstruct }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }: let version = "1.0.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0g4cq4bsksga15fa5ln083gkglawknbnhi2s4k8yk0yi5xngvwm4"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ cstruct ]; configureFlags = "--enable-tests"; doCheck = true; diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index 8580bb647134..ed058d82a0ed 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, cstruct }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }: let version = "1.5.1"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0y92wbvi129d0i7wr4lpk1ps9l247zaf1ibqqz0i6spgl28dyq79"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ cstruct ]; createFindlibDestdir = true;