ocamlPackages.cairo2: 0.5 -> 0.6 (#57965)

pkgs/development/ocaml-modules/cairo2/default.nix

@@ -1,43 +1,22 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, pkgconfig, cairo, lablgtk, gtk2,
-  enableGtkSupport ? true # Whether to compile with support for Gtk
-                          # integration (library file cairo2_gtk). Depends
-                          # on lablgtk and gtk2.
+{ stdenv, lib, fetchurl, buildDunePackage
+, pkgconfig, cairo
 }:
 
-let
-  inherit (stdenv.lib) optionals;
-  version = "0.5";
-in
-
-stdenv.mkDerivation {
-
-  name = "ocaml${ocaml.version}-cairo2-${version}";
+buildDunePackage rec {
+  pname = "cairo2";
+  version = "0.6";
 
   src = fetchurl {
-    url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tar.gz";
-    sha256 = "1559df74rzh4v7c9hr6phymq1f5121s83q0xy3r83x4apj74dchj";
+    url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz";
+    sha256 = "1k2q7ipmddqnd2clybj4qb5xwzzrnl2fxnd6kv60dlzgya18lchs";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ocaml findlib ocamlbuild cairo ]
-                ++ optionals enableGtkSupport [ gtk2 ];
+  buildInputs = [ cairo ];
 
-  # lablgtk2 is marked as a propagated build input since loading the
-  # cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as
-  # well.
-  propagatedBuildInputs = optionals enableGtkSupport [ lablgtk ];
+  doCheck = !stdenv.isDarwin;
 
-  createFindlibDestdir = true;
-
-  configurePhase = "ocaml setup.ml -configure --prefix $out"
-                 + (if enableGtkSupport then " --enable-lablgtk2"
-                                        else " --disable-lablgtk2");
-
-  buildPhase = "ocaml setup.ml -build";
-
-  installPhase = "ocaml setup.ml -install";
-
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "https://github.com/Chris00/ocaml-cairo";
     description = "Binding to Cairo, a 2D Vector Graphics Library";
     longDescription = ''
@@ -46,8 +25,7 @@ stdenv.mkDerivation {
       the X Window System, Quartz, Win32, image buffers, PostScript, PDF,
       and SVG file output.
     '';
-    license = licenses.lgpl3;
-    platforms = ocaml.meta.platforms or [];
-    maintainers = [ maintainers.jirkamarsik ];
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ jirkamarsik vbgl ];
   };
 }

pkgs/top-level/ocaml-packages.nix

@@ -357,9 +357,7 @@ let
 
     lablgl = callPackage ../development/ocaml-modules/lablgl { };
 
-    lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 {
-      cairo2 = cairo2.override { enableGtkSupport = false; };
-    };
+    lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { };
 
     lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { };