puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #5323 from kvtb/patch-6

Browse source 
fix creation of NAR files >4GB on 32-bit platforms
This commit is contained in:
Eelco Dolstra 2021-10-03 19:52:27 +02:00 committed by GitHub
parent 0be708b38c 638c73776a
commit 6a2887c750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libutil/archive.cc
View file

@ -42,7 +42,7 @@ static string caseHackSuffix = "~nix~case~hack~";
PathFilter defaultPathFilter = [](const Path &) { return true; }; PathFilter defaultPathFilter = [](const Path &) { return true; };
static void dumpContents(const Path & path, size_t size, static void dumpContents(const Path & path, off_t size,
Sink & sink) Sink & sink)
{ {
sink << "contents" << size; sink << "contents" << size;
@ -76,7 +76,7 @@ static void dump(const Path & path, Sink & sink, PathFilter & filter)
sink << "type" << "regular"; sink << "type" << "regular";
if (st.st_mode & S_IXUSR) if (st.st_mode & S_IXUSR)
sink << "executable" << ""; sink << "executable" << "";
dumpContents(path, (size_t) st.st_size, sink); dumpContents(path, st.st_size, sink);
} }
else if (S_ISDIR(st.st_mode)) { else if (S_ISDIR(st.st_mode)) {