From 9114b4731454cbbe547b8a0279b5084a672e6064 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 28 May 2018 05:50:12 +0000 Subject: ocamlPackages.gg: use opaline --- pkgs/development/ocaml-modules/gg/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index 0839ff361aea..0c80f39d9d7d 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0czj41sr8jsivl3z8wyblf9k971j3kx2wc3s0c1nhzcc8allg9i2"; }; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + buildInputs = [ ocaml findlib ocamlbuild opaline ]; createFindlibDestdir = true; @@ -27,10 +27,7 @@ stdenv.mkDerivation rec { buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} - ''; + installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; meta = with stdenv.lib; { description = "Basic types for computer graphics in OCaml"; -- cgit 1.4.1