about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix')
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
index f21e7643afe9..48bd37677421 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, cppo }:
+{ stdenv, fetchFromGitHub, ocaml, dune, cppo, findlib }:
 
-buildDunePackage rec {
+stdenv.mkDerivation rec {
   pname = "camomile";
 	version = "1.0.1";
 
@@ -11,10 +11,18 @@ buildDunePackage rec {
 		sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn";
 	};
 
-	buildInputs = [ cppo ];
+	buildInputs = [ ocaml dune findlib cppo ];
 
 	configurePhase = "ocaml configure.ml --share $out/share/camomile";
 
+  # Use jbuilder executable because it breaks on dune>=1.10
+  # https://github.com/yoriyuki/Camomile/commit/505202b58e22628f80bbe15ee76b9470a5bd2f57#r33816944
+  buildPhase = ''
+    jbuilder build -p ${pname}
+  '';
+
+  inherit (dune) installPhase;
+
 	meta = {
 		inherit (src.meta) homepage;
 		maintainers = [ stdenv.lib.maintainers.vbgl ];