nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 23:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

If "pv" is available at compile time, hard-code its path

Browse Source
This commit is contained in:
Eelco Dolstra 2012-04-13 14:41:33 +02:00
parent 34a85c5405
commit 969a14599d
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -171,6 +171,7 @@ NEED_PROG(bzip2, bzip2)
AC_PATH_PROG(dot, dot) AC_PATH_PROG(dot, dot)
AC_PATH_PROG(dblatex, dblatex) AC_PATH_PROG(dblatex, dblatex)
AC_PATH_PROG(gzip, gzip) 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). # Test that Perl has the open/fork feature (Perl 5.8.0 and beyond).

2
scripts/nix-copy-closure.in
View File

@ -63,7 +63,7 @@ while (@ARGV) {
$includeOutputs = 1; $includeOutputs = 1;
} }
elsif ($arg eq "--show-progress") { elsif ($arg eq "--show-progress") {
$progressViewer = "pv"; $progressViewer = "@pv@";
} }
elsif ($arg eq "--dry-run") { elsif ($arg eq "--dry-run") {
$dryRun = 1; $dryRun = 1;

1
substitute.mk
View File

@ -22,6 +22,7 @@
-e "s^@sed\@^$(sed)^g" \ -e "s^@sed\@^$(sed)^g" \
-e "s^@tar\@^$(tar)^g" \ -e "s^@tar\@^$(tar)^g" \
-e "s^@gzip\@^$(gzip)^g" \ -e "s^@gzip\@^$(gzip)^g" \
-e "s^@pv\@^$(pv)^g" \
-e "s^@tr\@^$(tr)^g" \ -e "s^@tr\@^$(tr)^g" \
-e "s^@dot\@^$(dot)^g" \ -e "s^@dot\@^$(dot)^g" \
-e "s^@xmllint\@^$(xmllint)^g" \ -e "s^@xmllint\@^$(xmllint)^g" \