diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-10-08 08:44:25 +0200 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-10-09 11:55:19 +0200 |
commit | 4168706d4fd35dc9c83d22725bede9b97b87750b (patch) | |
tree | ce23665cd16bf9429db01b34037b37be7d795a18 /pkgs/development/ocaml-modules/menhir | |
parent | 731b616fdbb7b3b0d753f5ac05926de33d17c177 (diff) |
OCaml modules: make explicit some dependencies to ocamlbuild
Diffstat (limited to 'pkgs/development/ocaml-modules/menhir')
-rw-r--r-- | pkgs/development/ocaml-modules/menhir/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/menhir/generic.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 5b2fd400cd7f5..839a49615cd84 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild , version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160526" else "20140422" }@args: diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index c182d21004901..9d4615a006b5f 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,4 +1,4 @@ -{ version, sha256, stdenv, fetchurl, ocaml, findlib }: +{ version, sha256, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "menhir-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit sha256; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; |