diff options
author | Cyril Cohen <cohen@crans.org> | 2022-05-04 23:57:52 +0200 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-05-12 06:11:43 +0200 |
commit | 82440c9374f4de934e287476e2b3a4bbf837d98a (patch) | |
tree | fea723fe7d80ab5d52a10f6d0b486249dbdc2898 /pkgs/applications/science/logic | |
parent | 7e589a45ef86abf9a6a737d9730925b81ee663b4 (diff) |
moving findlib to propagedNativeBuildInputs
Diffstat (limited to 'pkgs/applications/science/logic')
-rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 58edf0a0039a4..49b3130a4d9f2 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -72,7 +72,8 @@ let ] ocamlPackages_4_12; ocamlNativeBuildInputs = [ ocamlPackages.ocaml ] ++ optional (coqAtLeast "8.14") ocamlPackages.dune_2; - ocamlBuildInputs = [ ocamlPackages.findlib ] + ocamlPropagatedNativeBuildInputs = [ ocamlPackages.findlib ]; + ocamlPropagatedBuildInputs = [ ] ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!coqAtLeast "8.13") ocamlPackages.num ++ optional (coqAtLeast "8.13") ocamlPackages.zarith; @@ -82,7 +83,8 @@ self = stdenv.mkDerivation { passthru = { inherit coq-version; - inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs; + inherit ocamlPackages ocamlNativeNuildInputs; + inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs; # For compatibility inherit (ocamlPackages) ocaml camlp5 findlib num ; emacsBufferSetup = pkgs: '' @@ -143,7 +145,8 @@ self = stdenv.mkDerivation { else [ ocamlPackages.lablgtk ]) ; - propagatedBuildInputs = ocamlBuildInputs; + propagatedNativeBuildInputs = ocamlPropagatedNativeBuildInputs; + propagatedBuildInputs = ocamlPropagatedBuildInputs; postPatch = '' UNAME=$(type -tp uname) |