public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCaml modules: make explicit some dependencies to ocamlbuild

Browse Source
This commit is contained in:
Vincent Laporte
2016-10-09 11:55:19 +02:00
parent 731b616fdb
commit 4168706d4f
61 changed files with 125 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/ocaml/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, writeText, ocaml, findlib, camlp4 }:
{ stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }:
{ name, version, buildInputs ? [],
createFindlibDestdir ? true,
@@ -19,7 +19,7 @@ in
stdenv.mkDerivation (args // {
name = "ocaml-${name}-${version}";
buildInputs = [ ocaml findlib camlp4 ] ++ buildInputs;
buildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ buildInputs;
setupHook = if setupHook == null && hasSharedObjects
then writeText "setupHook.sh" ''