about summary refs log tree commit diff
path: root/substitute.mk
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-03-18T22·54+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-03-18T22·54+0100
commitb006a31d52b8f1cb01f3d722a6e3411dc8b98d64 (patch)
tree4edaff4f557a20a12e8cc9be4414081d71f46dd9 /substitute.mk
parent2e0322efd14df7a1658201fb443c8e90687dcfda (diff)
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.
Diffstat (limited to 'substitute.mk')
-rw-r--r--substitute.mk3
1 files changed, 1 insertions, 2 deletions
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" \