From db0dc689754280e1fc31bf742ee18fb01f892c59 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Feb 2023 20:43:16 +0100 Subject: [PATCH] mkCoqDerivation: findlib is an optional input --- pkgs/build-support/coq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index e0ba7b3e08c8..e26504a66f10 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -84,9 +84,9 @@ stdenv.mkDerivation (removeAttrs ({ inherit (fetched) version src; nativeBuildInputs = args.overrideNativeBuildInputs - or ([ which coq.ocamlPackages.findlib ] + or ([ which ] ++ optional useDune coq.ocamlPackages.dune_3 - ++ optional (useDune || mlPlugin) coq.ocamlPackages.ocaml + ++ optionals (useDune || mlPlugin) [ coq.ocamlPackages.ocaml coq.ocamlPackages.findlib ] ++ (args.nativeBuildInputs or []) ++ extraNativeBuildInputs); buildInputs = args.overrideBuildInputs or ([ coq ] ++ (args.buildInputs or []) ++ extraBuildInputs);