From 3d444cfd8e0a02f5854104c06cbcc0f6905ae6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 3 Dec 2018 08:19:28 +0000 Subject: [PATCH] pyre: simplify build phases --- pkgs/development/tools/pyre/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index fb6c8dd84be..87066284bfe 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -44,32 +44,29 @@ let # python36Packages.python36Full # TODO ]; - buildPhase = '' + preBuild = '' # build requires HOME to be set - export HOME=. + export HOME=$TMPDIR # "external" because https://github.com/facebook/pyre-check/pull/8/files sed "s/%VERSION%/external/" dune.in > dune - cp ${versionFile} ./scripts/generate-version-number.sh + ln -sf ${versionFile} ./scripts/generate-version-number.sh mkdir $(pwd)/build export OCAMLFIND_DESTDIR=$(pwd)/build export OCAMLPATH=$OCAMLPATH:$(pwd)/build - - make release ''; - checkPhase = '' - make test - # ./scripts/run-python-tests.sh # TODO: once typeshed and python bits are added - ''; + buildFlags = [ "release" ]; + + doCheck = true; + # ./scripts/run-python-tests.sh # TODO: once typeshed and python bits are added # Note that we're not installing the typeshed yet. # Improvement for a future version. installPhase = '' - mkdir -p $out/bin - cp ./_build/default/main.exe $out/bin/pyre.bin + install -D ./_build/default/main.exe $out/bin/pyre.bin ''; meta = with stdenv.lib; {