mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-22 12:53:54 +00:00
Merge pull request #219299 from vbgl/ocaml-mezzo-fix
ocamlPackages.mezzo: fix build
This commit is contained in:
commit
40120dbf3b
@ -1,4 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, menhirLib, yojson, ulex, pprint, fix, functory }:
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4, menhir
|
||||
, menhirLib, yojson, ulex, pprint, fix, functory
|
||||
}:
|
||||
|
||||
if lib.versionAtLeast ocaml.version "4.06"
|
||||
then throw "mezzo is not available for OCaml ${ocaml.version}"
|
||||
@ -24,8 +26,8 @@ stdenv.mkDerivation {
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
|
||||
buildInputs = [ yojson menhir menhirLib ulex pprint fix functory ];
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 menhir ];
|
||||
buildInputs = [ yojson menhirLib ulex pprint fix functory ocamlbuild ];
|
||||
|
||||
# Sets warning 3 as non-fatal
|
||||
prePatch = lib.optionalString (check-ocaml-version "4.02") ''
|
||||
|
Loading…
Reference in New Issue
Block a user