diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-05-28 06:12:33 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-06-06 07:14:22 +0000 |
| commit | 29a6ca660af6bcc20c87b6b4b88510016551d676 (patch) | |
| tree | 95bca2e5fb4d9e6a440af537b18a1c6d42a03f97 /pkgs/development/tools/ocaml | |
| parent | c066d9dfc3c3848036ee6ea6c90622de006215b3 (diff) | |
| download | nixlib-29a6ca660af6bcc20c87b6b4b88510016551d676.tar nixlib-29a6ca660af6bcc20c87b6b4b88510016551d676.tar.gz nixlib-29a6ca660af6bcc20c87b6b4b88510016551d676.tar.bz2 nixlib-29a6ca660af6bcc20c87b6b4b88510016551d676.tar.lz nixlib-29a6ca660af6bcc20c87b6b4b88510016551d676.tar.xz nixlib-29a6ca660af6bcc20c87b6b4b88510016551d676.tar.zst nixlib-29a6ca660af6bcc20c87b6b4b88510016551d676.zip | |
jbuilder: use opaline
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/jbuilder/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index 38fd4323d5ca..abfcdb61c1e6 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, opam }: +{ stdenv, fetchFromGitHub, ocamlPackages, opaline }: stdenv.mkDerivation rec { name = "jbuilder-${version}"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f"; }; - buildInputs = [ ocaml ]; + buildInputs = with ocamlPackages; [ ocaml findlib ]; dontAddPrefix = true; - installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; + installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; preFixup = "rm -rf $out/jbuilder"; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "Fast, portable and opinionated build system"; maintainers = [ stdenv.lib.maintainers.vbgl ]; license = stdenv.lib.licenses.asl20; - inherit (ocaml.meta) platforms; + inherit (ocamlPackages.ocaml.meta) platforms; }; } |