From c066d9dfc3c3848036ee6ea6c90622de006215b3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 28 May 2018 06:12:16 +0000 Subject: [PATCH] ocamlPackages.topkg: use opaline --- pkgs/development/ocaml-modules/topkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 9a655e055131..3ff641ff93e5 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -5,7 +5,7 @@ The `buildPhase` and `installPhase` attributes can be reused directly in many cases. When more fine-grained control on how to run the “topkg” build system is required, the attribute `run` can be used. */ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opaline }: if !stdenv.lib.versionAtLeast ocaml.version "4.01" then throw "topkg is not available for OCaml ${ocaml.version}" @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf ${src}"; buildPhase = "${run} build"; createFindlibDestdir = true; - installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; + installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; passthru = { inherit run; };