lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Remove a Darwin hack that should no longer be needed

Browse source
This commit is contained in:
Eelco Dolstra 2012-11-09 16:35:42 +01:00
parent 182e15b661
commit 4c9e3fa641
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/local-store.cc
View file

@ -964,13 +964,6 @@ void LocalStore::startSubstituter(const Path & substituter, RunningSubstituter &
case 0: /* child */ case 0: /* child */
try { try {
/* Hack to let "make check" succeed on Darwin. The
libtool wrapper script sets DYLD_LIBRARY_PATH to our
libutil (among others), but Perl also depends on a
library named libutil. As a result, substituters
written in Perl (i.e. all of them) fail. */
unsetenv("DYLD_LIBRARY_PATH");
/* Pass configuration options (including those overriden /* Pass configuration options (including those overriden
with --option) to the substituter. */ with --option) to the substituter. */
setenv("_NIX_OPTIONS", settings.pack().c_str(), 1); setenv("_NIX_OPTIONS", settings.pack().c_str(), 1);