From d551062ec4cf33b73df4e0d38671cbe6ca03abc5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed, 6 Aug 2003 09:35:05 +0000
Subject: [PATCH] * Scan for wget and use the full path in fetchurl.sh. * Use
 nix-hash (not md5sum) in fetchurl.sh.

---
 configure.ac                                      | 2 ++
 corepkgs/fetchurl/{fetchurl.sh => fetchurl.sh.in} | 4 ++--
 substitute.mk                                     | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename corepkgs/fetchurl/{fetchurl.sh => fetchurl.sh.in} (65%)

diff --git a/configure.ac b/configure.ac
index 57861063d..4dea89c95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,8 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_RANLIB
 
+AC_PATH_PROG(wget, wget)
+
 AC_CHECK_LIB(pthread, pthread_mutex_init)
 
 AM_CONFIG_HEADER([config.h])
diff --git a/corepkgs/fetchurl/fetchurl.sh b/corepkgs/fetchurl/fetchurl.sh.in
similarity index 65%
rename from corepkgs/fetchurl/fetchurl.sh
rename to corepkgs/fetchurl/fetchurl.sh.in
index 7b6243974..dc92c7ee5 100644
--- a/corepkgs/fetchurl/fetchurl.sh
+++ b/corepkgs/fetchurl/fetchurl.sh.in
@@ -1,9 +1,9 @@
 #! /bin/sh
 
 echo "downloading $url into $out..."
-wget "$url" -O "$out" || exit 1
+@wget@ "$url" -O "$out" || exit 1
 
-actual=$(md5sum -b $out | cut -c1-32)
+actual=$(@bindir@/nix-hash --flat $out)
 if ! test "$actual" == "$md5"; then
     echo "hash is $actual, expected $md5"
     exit 1
diff --git a/substitute.mk b/substitute.mk
index af3549253..8527cf6fd 100644
--- a/substitute.mk
+++ b/substitute.mk
@@ -4,5 +4,6 @@
 	 -e s^@bindir\@^$(bindir)^g \
 	 -e s^@sysconfdir\@^$(sysconfdir)^g \
 	 -e s^@localstatedir\@^$(localstatedir)^g \
+	 -e s^@wget\@^$(wget)^g \
 	 < $< > $@ || rm $@
 	chmod +x $@