From 0f4f35c7b05a559bee99bb2be45f850af8e3bda8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 23 Aug 2022 08:04:50 +0200 Subject: ocamlPackages.fmt: 0.8.9 → 0.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/logs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/development/ocaml-modules/logs') diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index adc7f255b19..0b8ffed91e4 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild , topkg, result, lwt, cmdliner, fmt +, fmtSupport ? lib.versionAtLeast ocaml.version "4.08" , js_of_ocaml , jsooSupport ? true }: @@ -22,13 +23,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ fmt cmdliner lwt topkg ] + buildInputs = [ cmdliner lwt topkg ] + ++ lib.optional fmtSupport fmt ++ lib.optional jsooSupport js_of_ocaml; propagatedBuildInputs = [ result ]; strictDeps = true; - buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}"; + buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport} --with-fmt ${lib.boolToString fmtSupport}"; inherit (topkg) installPhase; -- cgit 1.4.1