wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 17:41:48 +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

9
src/nix-build/local.mk
View file

@ -1,9 +0,0 @@
programs += nix-build
nix-build_DIR := $(d)
nix-build_SOURCES := $(d)/nix-build.cc
nix-build_LIBS = libmain libexpr libstore libutil libformat
$(eval $(call install-symlink, nix-build, $(bindir)/nix-shell))

14
src/nix-build/nix-build.cc
View file

@ -16,6 +16,7 @@
#include "get-drvs.hh"
#include "common-eval-args.hh"
#include "attr-path.hh"
#include "legacy.hh"
using namespace nix;
using namespace std::string_literals;
@ -66,11 +67,8 @@ std::vector<string> shellwords(const string & s)
return res;
}
void mainWrapped(int argc, char * * argv)
static void _main(int argc, char * * argv)
{
initNix();
initGC();
auto dryRun = false;
auto runEnv = std::regex_search(argv[0], std::regex("nix-shell$"));
auto pure = false;
@ -504,9 +502,5 @@ void mainWrapped(int argc, char * * argv)
}
}
int main(int argc, char * * argv)
{
return handleExceptions(argv[0], [&]() {
return mainWrapped(argc, argv);
});
}
static RegisterLegacyCommand s1("nix-build", _main);
static RegisterLegacyCommand s2("nix-shell", _main);