nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-28 05:00:58 +01:00
Code Activity

Clean some header related things.

Browse source 
Revert most of "Hack together a fix for the public headers"

- The `libmain` change is kept, and one more libmain change is made.
  (Need to update Meson and Nix per the package alike).

- The S3 situation is fixed in a different way: the variable is public
  now, used in the header, and fixed accordingly.

- Fix TODO for `HAVE_EMBEDDED_SANDBOX_SHELL`

This reverts commit 2b51250534.

(cherry picked from commit 3294b22a68)
This commit is contained in:
John Ericson 2025-04-06 17:17:54 -04:00 • committed by Mergify
parent 63b9b932f4
commit 7e96f31753
13 changed files with 32 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/unix/build/local-derivation-goal.cc
View file

@ -1935,7 +1935,7 @@ void LocalDerivationGoal::runChild()
for (auto & i : pathsInChroot) {
if (i.second.source == "/proc") continue; // backwards compatibility
#ifdef HAVE_EMBEDDED_SANDBOX_SHELL
#if HAVE_EMBEDDED_SANDBOX_SHELL
if (i.second.source == "__embedded_sandbox_shell__") {
static unsigned char sh[] = {
#include "embedded-sandbox-shell.gen.hh"