diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index a08e0ccbf74e..feb197defc32 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,37 +1,26 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner , topkg, uchar }: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; in -buildOcaml rec { - name = pname; - version = "0.9.4"; - - minimumSupportedOcamlVersion = "4.00.0"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "1.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1f71fyawxal42x6g82539bv0ava2smlar6rmxxz1cyq3l0i6fw0k"; + sha256 = "08i0cw02cxw4mi2rs01v9xi307qshs6fnd1dlqyb52kcxzblpp37"; }; - buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ]; + propagatedBuildInputs = [ uchar ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = '' - ocaml pkg/build.ml \ - native=true \ - native-dynlink=true \ - cmdliner=true - ''; - - installPhase = '' - opam-installer --prefix=$out --script ${pname}.install | sh - ln -s $out/lib/uutf $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { description = "Non-blocking streaming Unicode codec for OCaml";