diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-06-26 04:55:25 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-06-26 20:14:57 +0000 |
| commit | 06db050abd9985cbac0f2a96ffa91a5789482af7 (patch) | |
| tree | 59fe364adc4fa32162e316c539d99f06e7e3048f /pkgs/development/tools/ocaml/ocp-indent | |
| parent | ebc7d2019094e75a82f9577035522d14f745074a (diff) | |
| download | nixpkgs-06db050abd9985cbac0f2a96ffa91a5789482af7.tar nixpkgs-06db050abd9985cbac0f2a96ffa91a5789482af7.tar.gz nixpkgs-06db050abd9985cbac0f2a96ffa91a5789482af7.tar.bz2 nixpkgs-06db050abd9985cbac0f2a96ffa91a5789482af7.tar.lz nixpkgs-06db050abd9985cbac0f2a96ffa91a5789482af7.tar.xz nixpkgs-06db050abd9985cbac0f2a96ffa91a5789482af7.tar.zst nixpkgs-06db050abd9985cbac0f2a96ffa91a5789482af7.zip | |
ocamlPackages.ocp-indent: remove spurious dependency to opam and fix installPhase
Diffstat (limited to 'pkgs/development/tools/ocaml/ocp-indent')
| -rw-r--r-- | pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/ocp-indent/default.nix | 14 |
2 files changed, 6 insertions, 12 deletions
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 bdc75766bbf..3951be18de3 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 d11278f4d29..f30c0f278f7 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; |