wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 06:21:14 +02:00
Code Activity

Merge all nix-* binaries into nix

Browse source 
These are all symlinks to 'nix' now, reducing the installed size by
about ~1.7 MiB.
This commit is contained in:
Eelco Dolstra 2018-10-26 11:35:46 +02:00
parent c47e14ee45
commit f6a3dfe4e0
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
24 changed files with 105 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/nix-daemon/nix-daemon.cc
View file

@ -9,6 +9,7 @@
#include "monitor-fd.hh"
#include "derivations.hh"
#include "finally.hh"
#include "legacy.hh"
#include <algorithm>
@ -1058,11 +1059,9 @@ static void daemonLoop(char * * argv)
}
int main(int argc, char * * argv)
static int _main(int argc, char * * argv)
{
return handleExceptions(argv[0], [&]() {
initNix();
{
auto stdio = false;
parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) {
@ -1122,7 +1121,7 @@ int main(int argc, char * * argv)
if (res == -1)
throw SysError("splicing data from stdin to daemon socket");
else if (res == 0)
return;
return 0;
}
}
} else {
@ -1131,5 +1130,9 @@ int main(int argc, char * * argv)
} else {
daemonLoop(argv);
}
});
return 0;
}
}
static RegisterLegacyCommand s1("nix-daemon", _main);