diff options
| -rw-r--r-- | default.nix | 12 | ||||
| -rw-r--r-- | tools/CoqMakefile.in | 10 |
2 files changed, 9 insertions, 13 deletions
diff --git a/default.nix b/default.nix index d5e7674d4..2bf0409d6 100644 --- a/default.nix +++ b/default.nix @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { name = "coq"; buildInputs = [ - - # Coq dependencies hostname + python2 time # coq-makefile timing tools + ] ++ (with ocamlPackages; [ ocaml findlib @@ -67,13 +67,9 @@ stdenv.mkDerivation rec { # Test-suite dependencies # ncurses is required to build an OCaml REPL optional (!versionAtLeast ocaml.version "4.07") ncurses - ++ [ - python2 - rsync - which - ocamlPackages.ounit + ++ [ ocamlPackages.ounit rsync which ] - ] else []) ++ (if lib.inNixShell then [ + else []) ++ (if lib.inNixShell then [ ocamlPackages.merlin ocamlPackages.ocp-indent ocamlPackages.ocp-index diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in index 8e60d3932..7aa2d0a5a 100644 --- a/tools/CoqMakefile.in +++ b/tools/CoqMakefile.in @@ -65,20 +65,20 @@ VERBOSE ?= # Time the Coq process (set to non empty), and how (see default value) TIMED?= TIMECMD?= -# Use /usr/bin/env time on linux, gtime on Mac OS +# Use command time on linux, gtime on Mac OS TIMEFMT?="$* (real: %e, user: %U, sys: %S, mem: %M ko)" ifneq (,$(TIMED)) -ifeq (0,$(shell /usr/bin/env time -f $(TIMEFMT) true >/dev/null 2>/dev/null; echo $$?)) -STDTIME?=/usr/bin/env time -f $(TIMEFMT) +ifeq (0,$(shell command time -f $(TIMEFMT) true >/dev/null 2>/dev/null; echo $$?)) +STDTIME?=command time -f $(TIMEFMT) else ifeq (0,$(shell gtime -f $(TIMEFMT) true >/dev/null 2>/dev/null; echo $$?)) STDTIME?=gtime -f $(TIMEFMT) else -STDTIME?=time +STDTIME?=command time endif endif else -STDTIME?=/usr/bin/env time -f $(TIMEFMT) +STDTIME?=command time -f $(TIMEFMT) endif # Coq binaries |