diff --git a/nix/default.nix b/nix/default.nix index 8431cb45e5b..828adf7b25e 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -41,8 +41,8 @@ let # Additional ocaml package ocamlPackages = super.ocamlPackages // { vlq = import ./ocaml-vlq.nix { - inherit (self) stdenv fetchFromGitHub ocaml dune_1; - inherit (self.ocamlPackages) findlib; + inherit (self) fetchFromGitHub; + inherit (self.ocamlPackages) buildDunePackage; }; obelisk = import ./ocaml-obelisk.nix { inherit (self) stdenv lib fetchFromGitHub ocaml dune_2; diff --git a/nix/ocaml-vlq.nix b/nix/ocaml-vlq.nix index 103baf2d3dd..60ab8ac5640 100644 --- a/nix/ocaml-vlq.nix +++ b/nix/ocaml-vlq.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, dune_1 }: +{ buildDunePackage, fetchFromGitHub }: let version = "v0.2.0"; in -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-vlq-${version}"; +buildDunePackage { + pname = "vlq"; + inherit version; + + useDune2 = true; src = fetchFromGitHub { owner = "flowtype"; @@ -10,16 +13,4 @@ stdenv.mkDerivation { rev = version; sha256 = "09jdgih2n2qwpxnlbcca4xa193rwbd1nw7prxaqlg134l4mbya83"; }; - - buildInputs = [ ocaml findlib dune_1 ]; - - buildPhase = "dune build"; - - installPhase = "dune install --prefix $out --libdir $OCAMLFIND_DESTDIR vlq"; - - meta = { - homepage = https://github.com/flowtype/ocaml-vlq; - platforms = ocaml.meta.platforms or []; - description = "A simple library for encoding variable-length quantities"; - }; }