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

Add resolve-system-dependencies.pl

Browse source
This commit is contained in:
Jude Taylor 2015-10-21 12:38:45 -07:00
parent 15c7a79ed3
commit ff6953cb03
5 changed files with 150 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build.cc
View file

@ -60,9 +60,11 @@
#if __APPLE__
#define SANDBOX_ENABLED 1
#define DEFAULT_ALLOWED_IMPURE_PREFIXES "/System/Library /usr /dev /bin/sh"
#define DARWIN_PREBUILD 1
#else
#define SANDBOX_ENABLED 0
#define DEFAULT_ALLOWED_IMPURE_PREFIXES "/bin" "/usr/bin"
#define DARWIN_PREBUILD 0
#endif
#if CHROOT_ENABLED
@ -2045,6 +2047,11 @@ void DerivationGoal::startBuilder()
}
}
#if DARWIN_PREBUILD
if (settings.preBuildHook == "")
settings.preBuildHook = settings.nixLibexecDir + "/nix/resolve-system-dependencies.pl";
#endif
if (settings.preBuildHook != "") {
printMsg(lvlChatty, format("executing pre-build hook ‘%1%’")
% settings.preBuildHook);

2
src/libstore/local.mk
View file

@ -33,4 +33,4 @@ $(d)/local-store.cc: $(d)/schema.sql.hh
clean-files += $(d)/schema.sql.hh
$(eval $(call install-file-in, $(d)/nix-store.pc, $(prefix)/lib/pkgconfig, 0644))
$(eval $(call install-file-in, $(d)/sandbox-defaults.sb, $(prefix)/share/nix, 0644))
$(eval $(call install-file-in, $(d)/sandbox-defaults.sb, $(datadir)/nix, 0644))