From e739af593ae0a9ca20a839aa2a481628dd768ef6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Thu, 4 Oct 2018 09:14:32 +0000
Subject: [default.nix] some fixes

---
 default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 1faaafae03..a5c4c1fbb9 100644
--- a/default.nix
+++ b/default.nix
@@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
         (path: _:
            !elem (baseNameOf path) [".git" "result" "bin" "_build" "_build_ci"]) ./.;
 
+  preConfigure = "patchShebangs kernel/";
+
   prefixKey = "-prefix ";
 
   buildFlags = [ "world" "byte" ] ++ optional buildDoc "doc-html";
@@ -82,6 +84,10 @@ stdenv.mkDerivation rec {
   installTargets =
     [ "install" "install-byte" ] ++ optional buildDoc "install-doc-html";
 
+  createFindlibDestdir = !shell;
+
+  postInstall = "ln -s $out/lib/coq $OCAMLFIND_DESTDIR/coq";
+
   inherit doInstallCheck;
 
   preInstallCheck = ''
-- 
cgit v1.2.3


From 41dcd52864a569d2a0305ce97ad335238a0bc17d Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Thu, 4 Oct 2018 09:57:09 +0000
Subject: [default.nix] Add install dir to OCAMLPATH before running the
 test-suite

---
 default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index a5c4c1fbb9..1cc74dc0d2 100644
--- a/default.nix
+++ b/default.nix
@@ -93,6 +93,7 @@ stdenv.mkDerivation rec {
   preInstallCheck = ''
     patchShebangs tools/
     patchShebangs test-suite/
+    export OCAMLPATH=$OCAMLFIND_DESTDIR:$OCAMLPATH
   '';
 
   installCheckTarget = [ "check" ];
-- 
cgit v1.2.3