diff options
Diffstat (limited to 'pkgs')
7 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 06a67e9cb8b6..224f3537a2e0 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: stdenv.mkDerivation rec { name = "gapi-ocaml-0.2.10"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "https://forge.ocamlcore.org/frs/download.php/1601/${name}.tar.gz"; sha256 = "0kg4j7dhr7jynpy8x53bflqjf78jyl14j414l6px34xz7c9qx5fl"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix index 026f67d8ef44..4638748160a2 100644 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed, camlp4 }: +{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed, camlp4 }: stdenv.mkDerivation rec { version = "1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; }; - buildInputs = [ libev ocaml findlib ocaml_lwt ocaml_react ]; + buildInputs = [ libev ocaml findlib ocamlbuild ocaml_lwt ocaml_react ]; propagatedBuildInputs = [ camlp4 zed ]; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 60afad57b57b..f66773d426af 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed }: +{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1kwpsqds51xmy3z3ddkam92hkl7arlzy9awhzsq62ysxcl91fb8m"; }; - buildInputs = [ libev ocaml findlib ocaml_react ]; + buildInputs = [ libev ocaml findlib ocamlbuild ocaml_react ]; propagatedBuildInputs = [ zed ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 4c99ff2b6859..9eeed1285dcc 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: +{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: let inherit (stdenv.lib) optional getVersion versionAtLeast; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0gmhm282r8yi0gwcv0g2s7qchkfjmhqbqf4j9frlyv665ink9kxl"; }; - buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4 ppx_tools ]; + buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ppx_tools ]; propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index d4a38d9bd9e4..a177ae240d14 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, uutf, lwt }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, uutf, lwt }: stdenv.mkDerivation rec { pname = "ocaml-markup"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0d3wi22v7h0iqzq8dgl0g4fj2wb67gvmbzdckacifghinrx762k3"; }; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ocamlbuild ]; installPhase = "make ocamlfind-install"; diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 4f9644ea5be0..b8c415b75669 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re }: stdenv.mkDerivation rec { pname = "tyxml"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1rz0f48x8p1m30723rn5v85pp7rd0spr04sd7gzryy99vn3ianga"; }; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [uutf re ppx_tools markup]; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 45888924a2ef..b8740bc37932 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper, - ocaml_react, camomile, zed, cppo, camlp4, ppx_tools +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, ocaml_react +, lambdaTerm, ocaml_lwt, makeWrapper, camomile, zed, cppo, ppx_tools }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hxybkqmrh0sz1yyyrgzdmxp46gda4vk22pv07s0qpfg2dpv56jh"; }; - buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ppx_tools ]; + buildInputs = [ ocaml findlib ocamlbuild makeWrapper cppo camlp4 ppx_tools ]; propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; |