mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* nix-prefetch-url depends on sed (see

Browse source 
http://hydra.nixos.org/build/311170).
This commit is contained in:
Eelco Dolstra 2010-03-05 18:26:47 +00:00
parent 84a4dd5ff0
commit 05fbf61f0e
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

@ -149,6 +149,7 @@ AC_PATH_PROG(w3m, w3m, false)
AC_PATH_PROG(flex, flex, false) AC_PATH_PROG(flex, flex, false)
AC_PATH_PROG(bison, bison, false) AC_PATH_PROG(bison, bison, false)
NEED_PROG(perl, perl) NEED_PROG(perl, perl)
NEED_PROG(sed, sed)
NEED_PROG(tar, tar) NEED_PROG(tar, tar)
AC_PATH_PROG(dot, dot) AC_PATH_PROG(dot, dot)
AC_PATH_PROG(dblatex, dblatex) AC_PATH_PROG(dblatex, dblatex)

2
scripts/nix-prefetch-url.in
View file

@ -24,7 +24,7 @@ fi
# Handle escaped characters in the URI. `+', `=' and `?' are the only # Handle escaped characters in the URI. `+', `=' and `?' are the only
# characters that are valid in Nix store path names but have a special # characters that are valid in Nix store path names but have a special
# meaning in URIs. # meaning in URIs.
name=$(basename "$url" | sed -e 's/%2b/+/g' -e 's/%3d/=/g' -e 's/%3f/\?/g') name=$(basename "$url" | @sed@ -e 's/%2b/+/g' -e 's/%3d/=/g' -e 's/%3f/\?/g')
if test -z "$name"; then echo "invalid url"; exit 1; fi if test -z "$name"; then echo "invalid url"; exit 1; fi

1
substitute.mk
View file

@ -16,6 +16,7 @@
-e "s^@bzip2_bin_test\@^$(bzip2_bin_test)^g" \ -e "s^@bzip2_bin_test\@^$(bzip2_bin_test)^g" \
-e "s^@perl\@^$(perl)^g" \ -e "s^@perl\@^$(perl)^g" \
-e "s^@coreutils\@^$(coreutils)^g" \ -e "s^@coreutils\@^$(coreutils)^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^@tr\@^$(tr)^g" \ -e "s^@tr\@^$(tr)^g" \