From 82440c9374f4de934e287476e2b3a4bbf837d98a Mon Sep 17 00:00:00 2001
From: Cyril Cohen <cohen@crans.org>
Date: Wed, 4 May 2022 23:57:52 +0200
Subject: [PATCH] moving findlib to propagedNativeBuildInputs

---
 pkgs/applications/science/logic/coq/default.nix    | 9 ++++++---
 pkgs/development/coq-modules/simple-io/default.nix | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 58edf0a0039..49b3130a4d9 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)
diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix
index a0417ca978d..ca7325711e2 100644
--- a/pkgs/development/coq-modules/simple-io/default.nix
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@@ -12,7 +12,7 @@ with lib; mkCoqDerivation {
   release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci";
   release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
   mlPlugin = true;
-  nativeBuildInputs = coq.ocamlPackages.cppo;
+  nativeBuildInputs = [ coq.ocamlPackages.cppo ];
   propagatedBuildInputs = [ coq-ext-lib coq.ocamlPackages.ocamlbuild ];
 
   doCheck = true;