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

Fix static build

Browse source
This commit is contained in:
Eelco Dolstra 2022-06-23 18:00:10 +02:00
parent f959ce3e03
commit 03002203b7
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -110,7 +110,10 @@
bzip2 xz brotli editline bzip2 xz brotli editline
openssl sqlite openssl sqlite
libarchive libarchive
libzip (libzip.overrideDerivation (old: {
# Temporary workaround for https://github.com/NixOS/nixpkgs/pull/178755
cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_REGRESS=0" ];
}))
boost boost
lowdown-nix lowdown-nix
gtest gtest

4
src/libfetchers/input-accessor.cc
View file

@ -12,10 +12,6 @@ InputAccessor::InputAccessor()
{ } { }
// FIXME: merge with archive.cc. // FIXME: merge with archive.cc.
const std::string narVersionMagic1 = "nix-archive-1";
static std::string caseHackSuffix = "~nix~case~hack~";
void InputAccessor::dumpPath( void InputAccessor::dumpPath(
const CanonPath & path, const CanonPath & path,
Sink & sink, Sink & sink,

4
src/libutil/archive.cc
View file

@ -35,10 +35,6 @@ static ArchiveSettings archiveSettings;
static GlobalConfig::Register rArchiveSettings(&archiveSettings); static GlobalConfig::Register rArchiveSettings(&archiveSettings);
const std::string narVersionMagic1 = "nix-archive-1";
static std::string caseHackSuffix = "~nix~case~hack~";
PathFilter defaultPathFilter = [](const Path &) { return true; }; PathFilter defaultPathFilter = [](const Path &) { return true; };

4
src/libutil/archive.hh
View file

@ -102,7 +102,9 @@ void copyNAR(Source & source, Sink & sink);
void copyPath(const Path & from, const Path & to); void copyPath(const Path & from, const Path & to);
extern const std::string narVersionMagic1; inline constexpr std::string_view narVersionMagic1 = "nix-archive-1";
inline constexpr std::string_view caseHackSuffix = "~nix~case~hack~";
} }