From a2ee2a6eabe41cd62fcae720f3ee9abd61eb1eb9 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Thu, 22 Oct 2020 12:05:18 +0200
Subject: [default.nix] Propagate OCaml and findlib to user env.

This allows native_compute to work and is the same fix that was
applied to the nixpkgs repo in NixOS/nixpkgs#101058.
---
 default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index ffee77f1f7..7f9e62b28c 100644
--- a/default.nix
+++ b/default.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
     hostname
     python3 time # coq-makefile timing tools
   ]
-  ++ (with ocamlPackages; [ ocaml findlib ])
   ++ optionals buildIde [
     ocamlPackages.lablgtk3-sourceview3
     glib gnome3.defaultIconTheme wrapGAppsHook
@@ -69,10 +68,13 @@ stdenv.mkDerivation rec {
     ++ [ dune_2 ] # Maybe the next build system
   );
 
-  # Since #12604, ocamlfind looks for num when building plugins
+  # OCaml and findlib are needed so that native_compute works
+  # This follows a similar change in the nixpkgs repo (cf. NixOS/nixpkgs#101058)
+  # ocamlfind looks for zarith when building plugins
   # This follows a similar change in the nixpkgs repo (cf. NixOS/nixpkgs#94230)
-  # Same for zarith which is needed since its introduction as a dependency of Coq
-  propagatedBuildInputs = with ocamlPackages; [ zarith ];
+  propagatedBuildInputs = with ocamlPackages; [ ocaml findlib zarith ];
+
+  propagatedUserEnvPkgs = with ocamlPackages; [ ocaml findlib ];
 
   src =
     if shell then null
-- 
cgit v1.2.3