dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ocamlPackages.{ojquery,tuntap,uri}: adds ocamlbuild as dependency

Browse Source
This commit is contained in:
Vincent Laporte 2017-02-24 07:15:21 +00:00
parent 71739f348e
commit 9493ced9f7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/ojquery/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, ocaml, findlib, js_of_ocaml, camlp4 }: { stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, camlp4 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.1"; version = "0.1";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1n01bsk4car40p94fk1ssvww0inqapwwhdylmrb7vv40drsdldp1"; sha256 = "1n01bsk4car40p94fk1ssvww0inqapwwhdylmrb7vv40drsdldp1";
}; };
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ js_of_ocaml camlp4 ]; propagatedBuildInputs = [ js_of_ocaml camlp4 ];
createFindlibDestdir = true; createFindlibDestdir = true;

4
pkgs/development/ocaml-modules/tuntap/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, ipaddr }: { stdenv, fetchzip, ocaml, findlib, ocamlbuild, ipaddr }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "1cmd4kky875ks02gm2nb8yr80hmlfcnjdfyc63hvkh49acssy3d5"; sha256 = "1cmd4kky875ks02gm2nb8yr80hmlfcnjdfyc63hvkh49acssy3d5";
}; };
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ ipaddr ]; propagatedBuildInputs = [ ipaddr ];
createFindlibDestdir = true; createFindlibDestdir = true;

4
pkgs/development/ocaml-modules/uri/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, re, stringext, ounit { stdenv, fetchzip, ocaml, findlib, ocamlbuild, re, stringext, ounit
, sexplib, ppx_sexp_conv , sexplib, ppx_sexp_conv
, legacyVersion ? false , legacyVersion ? false
, sexplib_p4 , sexplib_p4
@ -24,7 +24,7 @@ stdenv.mkDerivation {
inherit sha256; inherit sha256;
}; };
buildInputs = [ ocaml findlib ounit ] buildInputs = [ ocaml findlib ocamlbuild ounit ]
++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv; ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv;
propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ]; propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ];