public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jbuilder: use opaline

Browse Source
This commit is contained in:
Vincent Laporte 2018-05-28 06:12:33 +00:00
parent c066d9dfc3
commit 29a6ca660a
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/ocaml/jbuilder/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, opam }: { stdenv, fetchFromGitHub, ocamlPackages, opaline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jbuilder-${version}"; name = "jbuilder-${version}";
@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f"; sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f";
}; };
buildInputs = [ ocaml ]; buildInputs = with ocamlPackages; [ ocaml findlib ];
dontAddPrefix = true; 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"; preFixup = "rm -rf $out/jbuilder";
@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
description = "Fast, portable and opinionated build system"; description = "Fast, portable and opinionated build system";
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
inherit (ocaml.meta) platforms; inherit (ocamlPackages.ocaml.meta) platforms;
}; };
} }