From 215235cce56b0a7322d52e6a94e65ec59dc83b7d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Fri, 13 May 2022 06:47:14 +0200
Subject: [PATCH] Revert "moving findlib to propagedNativeBuildInputs"

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

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 49b3130a4d9..58edf0a0039 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -72,8 +72,7 @@ let
     ] ocamlPackages_4_12;
   ocamlNativeBuildInputs = [ ocamlPackages.ocaml ]
     ++ optional (coqAtLeast "8.14") ocamlPackages.dune_2;
-  ocamlPropagatedNativeBuildInputs = [ ocamlPackages.findlib ];
-  ocamlPropagatedBuildInputs = [ ]
+  ocamlBuildInputs = [ ocamlPackages.findlib ]
     ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5
     ++ optional (!coqAtLeast "8.13") ocamlPackages.num
     ++ optional (coqAtLeast "8.13") ocamlPackages.zarith;
@@ -83,8 +82,7 @@ self = stdenv.mkDerivation {
 
   passthru = {
     inherit coq-version;
-    inherit ocamlPackages ocamlNativeNuildInputs;
-    inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs;
+    inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs;
     # For compatibility
     inherit (ocamlPackages) ocaml camlp5 findlib num ;
     emacsBufferSetup = pkgs: ''
@@ -145,8 +143,7 @@ self = stdenv.mkDerivation {
        else [ ocamlPackages.lablgtk ])
   ;
 
-  propagatedNativeBuildInputs = ocamlPropagatedNativeBuildInputs;
-  propagatedBuildInputs = ocamlPropagatedBuildInputs;
+  propagatedBuildInputs = ocamlBuildInputs;
 
   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 ca7325711e2..a0417ca978d 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;