From 43dc4612b034fb8d6a021f17bc402d9c03ad5680 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 24 Apr 2022 12:00:00 +0000 Subject: [PATCH] ocamlPackages.stdune: don't be incompatible with our version of csexp upstream does that as well: https://github.com/anmonteiro/nix-overlays/blob/8bc4e7e5f4d7579d5875ec1c11f5f20bb632b1fc/ocaml/dune/stdune.nix#L11 needed for ocaml-lsp --- pkgs/development/ocaml-modules/stdune/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/stdune/default.nix b/pkgs/development/ocaml-modules/stdune/default.nix index fd1e4f987b4..5e0b798772d 100644 --- a/pkgs/development/ocaml-modules/stdune/default.nix +++ b/pkgs/development/ocaml-modules/stdune/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune_3, dyn, ordering }: +{ lib, buildDunePackage, dune_3, dyn, ordering, csexp }: buildDunePackage { pname = "stdune"; @@ -7,7 +7,11 @@ buildDunePackage { dontAddPrefix = true; - propagatedBuildInputs = [ dyn ordering ]; + propagatedBuildInputs = [ dyn ordering csexp ]; + + preBuild = '' + rm -r vendor/csexp + ''; meta = dune_3.meta // { description = "Dune's unstable standard library";