diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-18T22·54+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-18T22·54+0100 |
| commit | b006a31d52b8f1cb01f3d722a6e3411dc8b98d64 (patch) | |
| tree | 4edaff4f557a20a12e8cc9be4414081d71f46dd9 /tests | |
| parent | 2e0322efd14df7a1658201fb443c8e90687dcfda (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 'tests')
| -rw-r--r-- | tests/common.sh.in | 5 | ||||
| -rw-r--r-- | tests/init.sh | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in index 5619580a72f0..316562f67b5f 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -29,15 +29,10 @@ export PATH=$NIX_BIN_DIR:$TOP/scripts:$PATH export NIX_BUILD_HOOK= export PERL=perl export PERL5LIB=$TOP/perl/lib:$PERL5LIB -export NIX_BZIP2="@bzip2_bin_test@/bzip2" -if test "${NIX_BZIP2:0:1}" != "/"; then - NIX_BZIP2=`pwd`/${NIX_BZIP2} -fi export dot=@dot@ export xmllint="@xmllint@" export xmlflags="@xmlflags@" export xsltproc="@xsltproc@" -export sqlite3="@sqlite_bin@/bin/sqlite3" export SHELL="@shell@" export version=@version@ diff --git a/tests/init.sh b/tests/init.sh index 4296f43b6108..777f95f77970 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -28,7 +28,6 @@ ln -s $TOP/scripts/nix-prefetch-url $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-build $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-pull $NIX_BIN_DIR/ mkdir -p $NIX_BIN_DIR/nix/substituters -ln -s $NIX_BZIP2 $NIX_BIN_DIR/nix/ ln -s $TOP/scripts/copy-from-other-stores.pl $NIX_BIN_DIR/nix/substituters cat > "$NIX_CONF_DIR"/nix.conf <<EOF |