From 65fb52f21045134690bacf5d9c21086db20ab1d1 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 20 Sep 2016 15:13:19 -0400 Subject: [PATCH] js-build-tools: Fix darwin build On darwin, js-build-tools expects an OSX style userland and stat binary. However, under nix we use the nix version of stat, which speaks linux-style flags. This patch removes js-build-tools special casing so that it speaks to stat in linux style. --- .../janestreet/js-build-tools-darwin.patch | 11 +++++++++++ .../ocaml-modules/janestreet/js-build-tools.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch b/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch new file mode 100644 index 00000000000..8878b4be68b --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch @@ -0,0 +1,11 @@ +--- a/ocamlbuild_goodies/jane_street_ocamlbuild_goodies.ml ++++ b/ocamlbuild_goodies/jane_street_ocamlbuild_goodies.ml +@@ -65,7 +65,7 @@ let track_external_deps = function + + let stat, md5sum = + match run_and_read "uname" |> String.trim with +- | "Darwin" -> ++ | "FreeBSD" | "NetBSD" -> + (S [A "stat"; A "-f"; A "%d:%i:%m"], + A "md5") + | _ -> diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix index d6e67b277ca..bf697eda800 100644 --- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix @@ -19,6 +19,8 @@ buildOcaml rec { configurePhase = "./configure --prefix $prefix"; installPhase = "opam-installer -i --prefix $prefix --libdir `ocamlfind printconf destdir` ${name}.install"; + patches = [ ./js-build-tools-darwin.patch ]; + meta = with stdenv.lib; { description = "Jane Street Build Tools"; maintainers = [ maintainers.maurer ];