From 0103c333d62fc60a912cf322e2f23f70b75708bd Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Tue, 20 Feb 2024 14:23:33 -0800 Subject: ocamlPackages.logs: allow overriding logs --- pkgs/development/ocaml-modules/mdx/default.nix | 9 +-------- pkgs/top-level/ocaml-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 53ea92a2bbef..1cd6a7d55e55 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -4,13 +4,6 @@ , gitUpdater }: -let - # Strip optional dependencies from logs to make the closure smaller as this - # package contains a binary - logs' = logs.override { jsooSupport = false; lwtSupport = false; }; - -in - buildDunePackage rec { pname = "mdx"; version = "2.3.1"; @@ -24,7 +17,7 @@ buildDunePackage rec { nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ - astring fmt logs' csexp ocaml-version camlp-streams re findlib + astring fmt logs csexp ocaml-version camlp-streams re findlib ]; checkInputs = [ alcotest lwt ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5e59435d789b..7317caa30744 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1032,7 +1032,9 @@ let mccs = callPackage ../development/ocaml-modules/mccs { }; - mdx = callPackage ../development/ocaml-modules/mdx { }; + mdx = callPackage ../development/ocaml-modules/mdx { + logs = logs.override { jsooSupport = false; lwtSupport = false; }; + }; mec = callPackage ../development/ocaml-modules/mec { }; -- cgit 1.4.1