From daf0f2b3a19f712315a8bb23571bea36166e3c39 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 10 Feb 2023 06:23:40 +0100 Subject: [PATCH] ocamlPackages.lsp: fix build of version 1.4.1 --- pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 3111d4277c41..1c7d72cbc36d 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -26,7 +26,7 @@ buildDunePackage rec { pname = "lsp"; inherit (jsonrpc) version src; duneVersion = if lib.versionAtLeast version "1.10.0" then "3" else "2"; - minimumOCamlVersion = + minimalOCamlVersion = if lib.versionAtLeast version "1.7.0" then "4.12" else @@ -74,7 +74,6 @@ buildDunePackage rec { [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ] else [ - cppo ppx_yojson_conv_lib ocaml-syntax-shims octavius @@ -83,6 +82,8 @@ buildDunePackage rec { cmdliner ]; + nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo; + propagatedBuildInputs = [ csexp jsonrpc