pyrox.dev
lol
ocamlPackages.ocp-indent: remove spurious dependency to opam and fix installPhase
+6
-12
+2
-2
pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
+2
-2
pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
···
1
-
{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
1
+
{ stdenv, fetchzip, ocaml, findlib, ocpBuild, cmdliner }:
2
2
3
3
let inherit (stdenv.lib) getVersion versionAtLeast; in
4
4
···
15
15
sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
16
16
};
17
17
18
-
nativeBuildInputs = [ ocpBuild opam ];
18
+
nativeBuildInputs = [ ocpBuild ];
19
19
20
20
buildInputs = [ ocaml findlib cmdliner ];
21
21
+4
-10
pkgs/development/tools/ocaml/ocp-indent/default.nix
+4
-10
pkgs/development/tools/ocaml/ocp-indent/default.nix
···
1
-
{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
1
+
{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocpBuild, cmdliner }:
2
2
3
3
let inherit (stdenv.lib) getVersion versionAtLeast; in
4
4
···
8
8
9
9
stdenv.mkDerivation rec {
10
10
11
-
name = "ocp-indent-${version}";
11
+
name = "ocaml${ocaml.version}-ocp-indent-${version}";
12
12
version = "1.6.1";
13
13
14
14
src = fetchzip {
···
16
16
sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
17
17
};
18
18
19
-
nativeBuildInputs = [ ocpBuild opam ];
19
+
nativeBuildInputs = [ ocpBuild ];
20
20
buildInputs = [ ocaml findlib cmdliner ];
21
21
22
-
createFindlibDestdir = true;
23
-
24
-
preConfigure = "patchShebangs ./install.sh";
25
-
26
-
postInstall = ''
27
-
mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
28
-
'';
22
+
inherit (jbuilder) installPhase;
29
23
30
24
meta = with stdenv.lib; {
31
25
homepage = http://typerex.ocamlpro.com/ocp-indent.html;