From c722db75ba35d7bc86d5e83c457ab34e88698041 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Aug 2018 16:51:54 +0000 Subject: ocamlPackages.{tyxml,lwt}: always enable camlp4 support --- pkgs/development/ocaml-modules/lwt/default.nix | 2 +- pkgs/development/ocaml-modules/tyxml/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 345ca037fec9..739e6e1e43a8 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder , ocaml, findlib, cppo , ocaml-migrate-parsetree, ppx_tools_versioned, result -, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07" +, withP4 ? true , camlp4 ? null }: diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index b34c9279c307..a38040e6e1fe 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re -, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07" +, withP4 ? true , camlp4 ? null }: -- cgit 1.4.1