From e98be5d5e09cd1c43789cba9d681cf0799d2e957 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 14 Aug 2021 12:00:00 +0000 Subject: [PATCH] ocamlPackages.findlib: refactor --- .../tools/ocaml/findlib/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 86685493d4c6..3d4c919bd835 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -16,19 +16,14 @@ stdenv.mkDerivation rec { dontAddPrefix=true; - preConfigure='' - configureFlagsArray=( - -bindir $out/bin - -mandir $out/share/man - -sitelib $out/lib/ocaml/${ocaml.version}/site-lib - -config $out/etc/findlib.conf - ) - ''; + configureFlags = [ + "-bindir" "${placeholder "out"}/bin" + "-mandir" "${placeholder "out"}/share/man" + "-sitelib" "${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" + "-config" "${placeholder "out"}/etc/findlib.conf" + ]; - buildPhase = '' - make all - make opt - ''; + buildFlags = [ "all" "opt" ]; setupHook = writeText "setupHook.sh" '' addOCamlPath () {