diff options
Diffstat (limited to 'pkgs/development/tools/ocaml/findlib/default.nix')
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/default.nix | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 186b78ce3f36..e25b94714b68 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,17 +1,33 @@ -{stdenv, fetchurl, m4, ncurses, ocaml, writeText}: +{ stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4" + then { + version = "1.8.0"; + sha256 = "1b97zqjdriqd2ikgh4rmqajgxwdwn013riji5j53y3xvcmnpsyrb"; + } else { + version = "1.7.3"; + sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; + sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; + }) ]; + }; +in stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; - version = "1.7.3"; + inherit (param) version; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; + inherit (param) sha256; }; buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ./install_topfind.patch ]; + patches = [ ./ldconf.patch ./install_topfind.patch ] + ++ (param.patches or []); dontAddPrefix=true; @@ -34,6 +50,9 @@ stdenv.mkDerivation rec { if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/" fi + if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"; then + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs" + fi export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" if test -n "$createFindlibDestdir"; then mkdir -p $OCAMLFIND_DESTDIR |