From b006a31d52b8f1cb01f3d722a6e3411dc8b98d64 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Mar 2012 23:54:57 +0100 Subject: Drop the externals directory Nix now requires SQLite and bzip2 to be pre-installed. SQLite is detected using pkg-config. We required DBD::SQLite anyway, so depending on SQLite is not a big problem. The --with-bzip2, --with-openssl and --with-sqlite flags are gone. --- substitute.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'substitute.mk') diff --git a/substitute.mk b/substitute.mk index 96fc16bf5bdc..3f2f367ff0d7 100644 --- a/substitute.mk +++ b/substitute.mk @@ -14,8 +14,7 @@ -e "s^@system\@^$(system)^g" \ -e "s^@shell\@^$(bash)^g" \ -e "s^@curl\@^$(curl)^g" \ - -e "s^@bzip2\@^$(bzip2_bin)/bzip2^g" \ - -e "s^@bzip2_bin_test\@^$(bzip2_bin_test)^g" \ + -e "s^@bzip2\@^$(bzip2)^g" \ -e "s^@perl\@^$(perl)^g" \ -e "s^@perlFlags\@^$(perlFlags)^g" \ -e "s^@coreutils\@^$(coreutils)^g" \ -- cgit 1.4.1