diff options
| author | Ulrik Strid <ulrik.strid@outlook.com> | 2022-02-24 15:01:15 +0100 |
|---|---|---|
| committer | Ulrik Strid <ulrik.strid@outlook.com> | 2022-02-25 07:54:17 +0100 |
| commit | 7e20e9039e7f2c41d478441d0ef453a34c1ec57a (patch) | |
| tree | 058bb2184b18a75b758264004de99e2018dfbd65 /pkgs/build-support/coq | |
| parent | 48df7cdbba1811b5c4791fc80e89e2b0790adc33 (diff) | |
coqPackages: tree-wide move packages to nativeBuildInputs and add strictDeps = true
Co-authored-by: Vincent Laporte <vbgl@users.noreply.github.com>
Diffstat (limited to 'pkgs/build-support/coq')
| -rw-r--r-- | pkgs/build-support/coq/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 569b07cded631..a681bbda5575d 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -16,6 +16,7 @@ in displayVersion ? {}, release ? {}, extraBuildInputs ? [], + extraNativeBuildInputs ? [], namePrefix ? [ "coq" ], enableParallelBuilding ? true, extraInstallFlags ? [], @@ -34,7 +35,7 @@ let args-to-remove = foldl (flip remove) ([ "version" "fetcher" "repo" "owner" "domain" "releaseRev" "displayVersion" "defaultVersion" "useMelquiondRemake" - "release" "extraBuildInputs" "extraPropagatedBuildInputs" "namePrefix" + "release" "extraBuildInputs" "extraNativeBuildInputs" "extraPropagatedBuildInputs" "namePrefix" "meta" "useDune2ifVersion" "useDune2" "opam-name" "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; @@ -67,9 +68,11 @@ stdenv.mkDerivation (removeAttrs ({ inherit (fetched) version src; - buildInputs = [ coq ] - ++ optionals mlPlugin coq.ocamlBuildInputs + nativeBuildInputs = [ coq ] ++ optionals useDune2 [coq.ocaml coq.ocamlPackages.dune_2] + ++ optionals mlPlugin coq.ocamlNativeBuildInputs + ++ extraNativeBuildInputs; + buildInputs = optionals mlPlugin coq.ocamlBuildInputs ++ extraBuildInputs; inherit enableParallelBuilding; |