From a4fa4c45cc7f0d2057729f0103a1600de32d642d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 2 Jun 2018 14:55:47 +0000 Subject: ocamlPackages.cmdliner_0_9: use opaline --- pkgs/development/ocaml-modules/cmdliner/0.9.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/ocaml-modules/cmdliner/0.9.nix b/pkgs/development/ocaml-modules/cmdliner/0.9.nix index e8824f318071..345d56d21707 100644 --- a/pkgs/development/ocaml-modules/cmdliner/0.9.nix +++ b/pkgs/development/ocaml-modules/cmdliner/0.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: let pname = "cmdliner"; @@ -17,17 +17,12 @@ stdenv.mkDerivation rec { }; unpackCmd = "tar xjf $src"; - nativeBuildInputs = [ ocamlbuild opam ]; + nativeBuildInputs = [ ocamlbuild opaline ]; buildInputs = [ ocaml findlib ]; - createFindlibDestdir = true; - configurePhase = "ocaml pkg/git.ml"; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - installPhase = '' - opam-installer --script --prefix=$out | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; meta = with stdenv.lib; { homepage = http://erratique.ch/software/cmdliner; -- cgit 1.4.1