From f3704de6497e269f2de2e99b3b9eaadbd6630c22 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 8 Jan 2021 17:25:54 +0100 Subject: [PATCH] dune: let dune install itself --- pkgs/development/tools/ocaml/dune/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index ef0f5c4fabd4..031cbcca21d8 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opaline }: +{ stdenv, fetchurl, ocaml, findlib }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "dune is not available for OCaml ${ocaml.version}" @@ -15,15 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; buildFlags = [ "release" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "LIBDIR=$(OCAMLFIND_DESTDIR)" + ]; dontAddPrefix = true; - installPhase = '' - runHook preInstall - ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR - runHook postInstall - ''; - meta = { homepage = "https://dune.build/"; description = "A composable build system";