From fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 5 Sep 2018 16:11:47 +0000 Subject: jbuilder: 1.0.1 -> dune: 1.1.1 --- pkgs/development/ocaml-modules/camlimages/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/ocaml-modules/camlimages') diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index def710f3f1b0..b5ef173c9ff8 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, findlib, jbuilder, ocaml, configurator, cppo, lablgtk }: +{ stdenv, fetchzip, findlib, dune, ocaml, configurator, cppo, lablgtk }: stdenv.mkDerivation rec { name = "camlimages-${version}"; version = "5.0.0"; @@ -6,9 +6,9 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.gz"; sha256 = "00qvwxkfnhv93yi1iq7vy3p5lxyi9xigxcq464s4ii6bmp32d998"; }; - buildInputs = [ findlib jbuilder ocaml configurator cppo lablgtk ]; - buildPhase = "jbuilder build -p camlimages"; - inherit (jbuilder) installPhase; + buildInputs = [ findlib dune ocaml configurator cppo lablgtk ]; + buildPhase = "dune build -p camlimages"; + inherit (dune) installPhase; meta = with stdenv.lib; { branch = "5.0"; -- cgit 1.4.1