From 06db050abd9985cbac0f2a96ffa91a5789482af7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 26 Jun 2018 04:55:25 +0000
Subject: ocamlPackages.ocp-indent: remove spurious dependency to opam and fix
 installPhase

---
 pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix   |  4 ++--
 pkgs/development/tools/ocaml/ocp-indent/default.nix | 14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'pkgs/development/tools/ocaml')

diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
index bdc75766bbf7..3951be18de3a 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
+{ stdenv, fetchzip, ocaml, findlib, ocpBuild, cmdliner }:
 
 let inherit (stdenv.lib) getVersion versionAtLeast; in
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
   };
 
-  nativeBuildInputs = [ ocpBuild opam ];
+  nativeBuildInputs = [ ocpBuild ];
 
   buildInputs = [ ocaml findlib cmdliner ];
 
diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix
index d11278f4d29c..f30c0f278f78 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
+{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocpBuild, cmdliner }:
 
 let inherit (stdenv.lib) getVersion versionAtLeast; in
 
@@ -8,7 +8,7 @@ assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
 
 stdenv.mkDerivation rec {
 
-  name = "ocp-indent-${version}";
+  name = "ocaml${ocaml.version}-ocp-indent-${version}";
   version = "1.6.1";
 
   src = fetchzip {
@@ -16,16 +16,10 @@ stdenv.mkDerivation rec {
     sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
   };
 
-  nativeBuildInputs = [ ocpBuild opam ];
+  nativeBuildInputs = [ ocpBuild ];
   buildInputs = [ ocaml findlib cmdliner ];
 
-  createFindlibDestdir = true;
-
-  preConfigure = "patchShebangs ./install.sh";
-
-  postInstall = ''
-    mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
-  '';
+  inherit (jbuilder) installPhase;
 
   meta = with stdenv.lib; {
     homepage = http://typerex.ocamlpro.com/ocp-indent.html;
-- 
cgit 1.4.1