diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 07f3053b9d43..3b4ad8b89c39 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, - findlib, camlp4, sedlex, ocamlbuild, lwt_ppx, wtf8, dtoa }: +{ stdenv, fetchFromGitHub, lib, ocamlPackages, libelf, cf-private, CoreServices }: with lib; @@ -14,21 +13,15 @@ stdenv.mkDerivation rec { sha256 = "0xrcjjk16w6anpy58qa4la1jyfjs0xg5xkp58slhai996wqif24k"; }; - # lwt.log is being split out into a separate package, so this can be - # removed once nixpkgs is updated. - # See https://github.com/ocsigen/lwt/issues/453#issuecomment-352897664 - postPatch = '' - substituteInPlace Makefile --replace lwt_log lwt.log - ''; - installPhase = '' mkdir -p $out/bin cp bin/flow $out/bin/ ''; - buildInputs = [ - ocaml libelf findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa - ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; + buildInputs = [ libelf + ] ++ (with ocamlPackages; [ + ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx lwt_log wtf8 dtoa + ]) ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { description = "A static type checker for JavaScript"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba3d88ed92d1..595ea43e7fe3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8098,8 +8098,6 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; - inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx - wtf8 dtoa; }; foreman = callPackage ../tools/system/foreman { };