summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2018-12-21 08:22:08 -0500
committerJörg Thalheim <joerg@thalheim.io>2018-12-21 16:20:44 +0100
commit485bf85407ea79cd7fdfcab2fde983e9a3d85f0e (patch)
tree338946a539d6499f4179ef9c9b7415be6d58a381
parent594fd0ff6e0b729130f2cbe02ab2cb35144e8c5b (diff)
pyre: fix watchman references
-rw-r--r--pkgs/development/tools/pyre/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index 87066284bfef..a93dedded291 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 \