diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-13T12·41+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-13T12·41+0200 |
| commit | 969a14599d2f7bfd02971475b5b2be49fb965117 (patch) | |
| tree | ee8e29c17041e39a4f09dfb41fe39e2d46d2a340 | |
| parent | 34a85c5405a228860a7bbe77239fb0204bf6952c (diff) | |
If "pv" is available at compile time, hard-code its path
| -rw-r--r-- | configure.ac | 1 | ||||
| -rwxr-xr-x | scripts/nix-copy-closure.in | 2 | ||||
| -rw-r--r-- | substitute.mk | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c37f76870c55..fba53e81603c 100644 --- a/configure.ac +++ b/configure.ac @@ -171,6 +171,7 @@ NEED_PROG(bzip2, bzip2) AC_PATH_PROG(dot, dot) AC_PATH_PROG(dblatex, dblatex) AC_PATH_PROG(gzip, gzip) +AC_PATH_PROG(pv, pv, pv) # Test that Perl has the open/fork feature (Perl 5.8.0 and beyond). diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in index ca240d3ee5f8..12a83cff979c 100755 --- a/scripts/nix-copy-closure.in +++ b/scripts/nix-copy-closure.in @@ -63,7 +63,7 @@ while (@ARGV) { $includeOutputs = 1; } elsif ($arg eq "--show-progress") { - $progressViewer = "pv"; + $progressViewer = "@pv@"; } elsif ($arg eq "--dry-run") { $dryRun = 1; diff --git a/substitute.mk b/substitute.mk index 9009b4249485..d28b330a673d 100644 --- a/substitute.mk +++ b/substitute.mk @@ -22,6 +22,7 @@ -e "s^@sed\@^$(sed)^g" \ -e "s^@tar\@^$(tar)^g" \ -e "s^@gzip\@^$(gzip)^g" \ + -e "s^@pv\@^$(pv)^g" \ -e "s^@tr\@^$(tr)^g" \ -e "s^@dot\@^$(dot)^g" \ -e "s^@xmllint\@^$(xmllint)^g" \ |