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

ocamlPackages.camomile: fix build for OCaml 4.05

Browse Source
This commit is contained in:
Vincent Laporte 2017-07-13 22:46:03 +02:00
parent c5798c1db2
commit 53a50dfa7a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/camomile/0.8.2.nix
View File

@ -1,5 +1,9 @@
{stdenv, fetchurl, ocaml, findlib, camlp4}:
if stdenv.lib.versionAtLeast ocaml.version "4.05"
then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
name = "camomile-${version}";
version = "0.8.2";

7
pkgs/development/ocaml-modules/camomile/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, camlp4}:
{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}:
stdenv.mkDerivation rec {
name = "camomile-${version}";
@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045";
};
patches = [ (fetchpatch {
url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch;
sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb";
})];
buildInputs = [ocaml findlib camlp4];
createFindlibDestdir = true;