Merge pull request #215637 from vbgl/ocaml-lsp-fix-legacy
ocamlPackages.lsp: fix build of version 1.4.1
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user