diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-02-24 18:19:44 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-03-01 22:39:43 +0100 |
| commit | d02dc3c5fdfd5214f165c67fd6fcf20c36634bdf (patch) | |
| tree | 90236d86c4900cfb9650e995f78f570aaf660cb6 /pkgs/development/tools/ocaml | |
| parent | ec97c20fff7fac51dc3eb3f2d91ff7f0376c8c8f (diff) | |
| download | nixlib-d02dc3c5fdfd5214f165c67fd6fcf20c36634bdf.tar nixlib-d02dc3c5fdfd5214f165c67fd6fcf20c36634bdf.tar.gz nixlib-d02dc3c5fdfd5214f165c67fd6fcf20c36634bdf.tar.bz2 nixlib-d02dc3c5fdfd5214f165c67fd6fcf20c36634bdf.tar.lz nixlib-d02dc3c5fdfd5214f165c67fd6fcf20c36634bdf.tar.xz nixlib-d02dc3c5fdfd5214f165c67fd6fcf20c36634bdf.tar.zst nixlib-d02dc3c5fdfd5214f165c67fd6fcf20c36634bdf.zip | |
ocamlPackages.ocp-build: fix for OCaml ≥ 4.08
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/ocp-build/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index cf5372bdc202..ca74a701315a 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }: +{ stdenv, fetchpatch, fetchFromGitHub, ocaml, findlib, ncurses }: let version = "1.99.19-beta"; in @@ -13,6 +13,11 @@ stdenv.mkDerivation { sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj"; }; + patches = stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.08") (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-pp/ocp-pp.1.99.19-beta/files/0001-Fix-ocp-pp-for-changes-in-compiler-libs.patch"; + sha256 = "0s0s2hh4d7cmwd6i7ixjgb79vij0r1v54m0vwwi26b3fips09qyn"; + }); + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; |