From 485bf85407ea79cd7fdfcab2fde983e9a3d85f0e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 21 Dec 2018 08:22:08 -0500 Subject: [PATCH] pyre: fix watchman references --- pkgs/development/tools/pyre/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index 87066284bfe..a93dedded29 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript -, dune, python3, rsync, fetchpatch, buck }: +{ stdenv, fetchFromGitHub, ocamlPackages, writeScript +, dune, python3, rsync, buck, watchman }: let # Manually set version - the setup script requires # hg and git + keeping the .git directory around. @@ -103,6 +103,10 @@ in python3.pkgs.buildPythonApplication rec { substituteInPlace scripts/build-pypi-package.sh \ --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \ --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$PWD/build" + for file in client/pyre.py client/commands/initialize.py client/commands/tests/initialize_test.py; do + substituteInPlace "$file" \ + --replace '"watchman"' '"${watchman}/bin/watchman"' + done substituteInPlace client/buck.py \ --replace '"buck"' '"${buck}/bin/buck"' substituteInPlace client/tests/buck_test.py \