From e3aa8c650b5bde425c935296f40b4455a0655742 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 8 Apr 2021 15:58:09 +0200 Subject: [PATCH] ocamlPackages.lablgtk3: use Dune 2 --- pkgs/development/ocaml-modules/lablgtk3/default.nix | 5 ++++- pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix | 2 +- pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 1f6b0ad76b9..b14f5b736b4 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,9 +1,11 @@ -{ lib, fetchurl, pkg-config, buildDunePackage, gtk3, cairo2 }: +{ lib, fetchurl, pkg-config, buildDunePackage, dune-configurator, gtk3, cairo2 }: buildDunePackage rec { version = "3.1.1"; pname = "lablgtk3"; + useDune2 = true; + minimumOCamlVersion = "4.05"; src = fetchurl { @@ -12,6 +14,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ gtk3 cairo2 ]; meta = { diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix index be57c7e7146..b037f7d989f 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix @@ -4,5 +4,5 @@ buildDunePackage { pname = "lablgtk3-gtkspell3"; buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs; propagatedBuildInputs = [ lablgtk3 ]; - inherit (lablgtk3) src version meta nativeBuildInputs; + inherit (lablgtk3) src version useDune2 meta nativeBuildInputs; } diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix index 0e8ba3ef3ff..a0560029880 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -4,5 +4,5 @@ buildDunePackage { pname = "lablgtk3-sourceview3"; buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; propagatedBuildInputs = [ lablgtk3 ]; - inherit (lablgtk3) src version meta nativeBuildInputs; + inherit (lablgtk3) src version useDune2 meta nativeBuildInputs; }