From a5c133a4b4fec615c31de82f5235709ecbcab6c0 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Thu, 19 Aug 2021 12:00:00 +0000 Subject: [PATCH] ocamlbuild: fix build findlib's setup hook is now a preConfigure setup hook, so make sure to run it --- pkgs/development/tools/ocaml/ocamlbuild/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index d4c7cfcac164..e3043d46ee5e 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -19,11 +19,15 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; configurePhase = '' + runHook preConfigure + make -f configure.make Makefile.config \ "OCAMLBUILD_PREFIX=$out" \ "OCAMLBUILD_BINDIR=$out/bin" \ "OCAMLBUILD_MANDIR=$out/share/man" \ "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR" + + runHook postConfigure ''; meta = with lib; {