diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-08 21:32:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 21:32:08 -0500 |
| commit | 4f8e60f65a2aa3a2f66d0383f70eede82f24b8be (patch) | |
| tree | 4653a49e640d0bc602e26c71921d016b994755f9 /pkgs/development/ocaml-modules | |
| parent | eeece37e7a95f50ff7197adab5647d4d178ef04d (diff) | |
| parent | 32cdc7967e93b3bd6059775c37f23bfb15a03ee5 (diff) | |
| download | nixlib-4f8e60f65a2aa3a2f66d0383f70eede82f24b8be.tar nixlib-4f8e60f65a2aa3a2f66d0383f70eede82f24b8be.tar.gz nixlib-4f8e60f65a2aa3a2f66d0383f70eede82f24b8be.tar.bz2 nixlib-4f8e60f65a2aa3a2f66d0383f70eede82f24b8be.tar.lz nixlib-4f8e60f65a2aa3a2f66d0383f70eede82f24b8be.tar.xz nixlib-4f8e60f65a2aa3a2f66d0383f70eede82f24b8be.tar.zst nixlib-4f8e60f65a2aa3a2f66d0383f70eede82f24b8be.zip | |
Merge pull request #38319 from vbgl/ocamlnet-4.06
ocamlPackages.ocamlnet: fix build with OCaml 4.06
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocamlnet/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 573de26096cd..492bb9c67cdf 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip -, gnutls, nettle }: +, gnutls, nettle, fetchpatch +}: let version = "4.1.5"; in @@ -11,6 +12,12 @@ stdenv.mkDerivation { sha256 = "1ppcd2zjhj6s3ib9q8dngnr53qlmkhvv7a8hzp88r79k6jygn4cm"; }; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocamlnet/ocamlnet.4.1.5/files/netgzip.patch"; + sha256 = "1say7zzgk24qcy9m91gcfgvz4fv7nksx4j5qnbxyq8wqw0g88ba0"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; |