From 05fbf61f0e4f2670d23929235e2da5342599d447 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Mar 2010 18:26:47 +0000 Subject: [PATCH] * nix-prefetch-url depends on sed (see http://hydra.nixos.org/build/311170). --- configure.ac | 1 + scripts/nix-prefetch-url.in | 2 +- substitute.mk | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 46036113..708e6196 100644 --- a/configure.ac +++ b/configure.ac @@ -149,6 +149,7 @@ AC_PATH_PROG(w3m, w3m, false) AC_PATH_PROG(flex, flex, false) AC_PATH_PROG(bison, bison, false) NEED_PROG(perl, perl) +NEED_PROG(sed, sed) NEED_PROG(tar, tar) AC_PATH_PROG(dot, dot) AC_PATH_PROG(dblatex, dblatex) diff --git a/scripts/nix-prefetch-url.in b/scripts/nix-prefetch-url.in index 7d8bd93a..31170fa9 100644 --- a/scripts/nix-prefetch-url.in +++ b/scripts/nix-prefetch-url.in @@ -24,7 +24,7 @@ fi # Handle escaped characters in the URI. `+', `=' and `?' are the only # characters that are valid in Nix store path names but have a special # 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 diff --git a/substitute.mk b/substitute.mk index ae11ce2b..72911647 100644 --- a/substitute.mk +++ b/substitute.mk @@ -16,6 +16,7 @@ -e "s^@bzip2_bin_test\@^$(bzip2_bin_test)^g" \ -e "s^@perl\@^$(perl)^g" \ -e "s^@coreutils\@^$(coreutils)^g" \ + -e "s^@sed\@^$(sed)^g" \ -e "s^@tar\@^$(tar)^g" \ -e "s^@gzip\@^$(gzip)^g" \ -e "s^@tr\@^$(tr)^g" \