From 853fb4598fcc96c7f27c795332d49292f871edcd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 28 May 2018 06:08:03 +0000 Subject: [PATCH] ocamlPackages.uchar: use opaline --- pkgs/development/ocaml-modules/uchar/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix index 6b27f00fb150..8fddf883da5d 100644 --- a/pkgs/development/ocaml-modules/uchar/default.nix +++ b/pkgs/development/ocaml-modules/uchar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-uchar-0.0.2"; @@ -9,15 +9,9 @@ stdenv.mkDerivation { }; unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml ocamlbuild opam ]; + buildInputs = [ ocaml ocamlbuild findlib opaline ]; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - installPhase = '' - opam-installer --script --prefix=$out uchar.install > install.sh - sh install.sh - mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/ - ln -s $out/lib/uchar $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; - + installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; meta = { description = "Compatibility library for OCaml’s Uchar module";