From 033c5debbc2db8f934aad4bd2b35b899d839fb46 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 1 Apr 2017 07:39:13 +0200
Subject: [PATCH] utop: fix on OCaml 4.04
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don’t strip the binary
The wrapper directly calls ocamlrun
---
 pkgs/development/tools/ocaml/utop/default.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 9b41a06c935..31549729cfe 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -25,14 +25,24 @@ stdenv.mkDerivation rec {
     make doc
     '';
 
+  dontStrip = true;
+
   postFixup =
-  let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
-  in
+   let p = p: "${p}/lib/ocaml/${ocaml.version}/site-lib"; in
    ''
-   for prog in "$out"/bin/*
+   pushd $out/bin
+   for prog in *
    do
-    wrapProgram $prog --set CAML_LD_LIBRARY_PATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib/lwt/:"${lambdaTerm}"/lib/ocaml/${ocamlVersion}/site-lib/lambda-term/:'$CAML_LD_LIBRARY_PATH' --set OCAMLPATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib:${ocaml_react}/lib/ocaml/${ocamlVersion}/site-lib:${camomile}/lib/ocaml/${ocamlVersion}/site-lib:${zed}/lib/ocaml/${ocamlVersion}/site-lib:${lambdaTerm}/lib/ocaml/${ocamlVersion}/site-lib:"$out"/lib/ocaml/${ocamlVersion}/site-lib:'$OCAMLPATH'
+    mv $prog .$prog-wrapped
+    cat > $prog <<EOF
+#!/bin/sh
+export CAML_LD_LIBRARY_PATH=${p ocaml_lwt}/lwt:${p lambdaTerm}/lambda-term:'\$CAML_LD_LIBRARY_PATH'
+export OCAMLPATH=${p ocaml_lwt}:${p ocaml_react}:${p camomile}:${p zed}:${p lambdaTerm}:"$out"/lib/ocaml/${ocaml.version}/site-lib:'\$OCAMLPATH'
+${ocaml}/bin/ocamlrun $out/bin/.$prog-wrapped \$*
+EOF
+    chmod +x $prog
    done
+   popd
    '';
 
   meta = {