max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-26 07:46:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into flakes

Browse source
This commit is contained in:
Eelco Dolstra 2020-01-28 13:19:30 +01:00
commit ab41e9d543
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -2580,6 +2580,7 @@ void DerivationGoal::writeStructuredAttrs()
} }
writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites)); writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
chownToBuilder(tmpDir + "/.attrs.json");
/* As a convenience to bash scripts, write a shell file that /* As a convenience to bash scripts, write a shell file that
maps all attributes that are representable in bash - maps all attributes that are representable in bash -
@ -2648,6 +2649,7 @@ void DerivationGoal::writeStructuredAttrs()
} }
writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites)); writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
chownToBuilder(tmpDir + "/.attrs.sh");
} }

2
src/libstore/path.hh
View file

@ -7,7 +7,7 @@ namespace nix {
/* See path.rs. */ /* See path.rs. */
struct StorePath; struct StorePath;
struct Store; class Store;
extern "C" { extern "C" {
void ffi_StorePath_drop(void *); void ffi_StorePath_drop(void *);