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

6
src/libstore/s3-binary-cache-store.cc
View file

@ -1,10 +1,10 @@
#include "store-config-private.hh"
#if ENABLE_S3
#include "nix/store/s3-binary-cache-store.hh"
#if NIX_WITH_S3_SUPPORT
#include <assert.h>
#include "nix/store/s3.hh"
#include "nix/store/s3-binary-cache-store.hh"
#include "nix/store/nar-info.hh"
#include "nix/store/nar-info-disk-cache.hh"
#include "nix/store/globals.hh"