From ddd479fe7c2500f4d2582467ba54dee007e43a58 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 7 Aug 2021 12:00:00 +0000 Subject: [PATCH] ocamlPackages.mkDerivation: use nativeBuildInputs for build tools --- pkgs/build-support/ocaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix index 88ed3dfc2c2f..cd17eb688c2e 100644 --- a/pkgs/build-support/ocaml/default.nix +++ b/pkgs/build-support/ocaml/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: -{ name, version, buildInputs ? [], +{ name, version, nativeBuildInputs ? [], createFindlibDestdir ? true, dontStrip ? true, minimumSupportedOcamlVersion ? null, @@ -19,7 +19,7 @@ in stdenv.mkDerivation (args // { name = "ocaml-${name}-${version}"; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ buildInputs; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ nativeBuildInputs; setupHook = if setupHook == null && hasSharedObjects then writeText "setupHook.sh" ''