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.nix18
1 files changed, 5 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
index 48bd37677421..ff0cb4aa3fe0 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,28 +1,20 @@
-{ stdenv, fetchFromGitHub, ocaml, dune, cppo, findlib }:
+{ stdenv, fetchFromGitHub, buildDunePackage, cppo }:
 
-stdenv.mkDerivation rec {
+buildDunePackage rec {
   pname = "camomile";
-	version = "1.0.1";
+	version = "1.0.2";
 
 	src = fetchFromGitHub {
 		owner = "yoriyuki";
 		repo = pname;
 		rev = version;
-		sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn";
+		sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
 	};
 
-	buildInputs = [ ocaml dune findlib cppo ];
+	buildInputs = [ 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 ];