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

ExternalDerivationBuilder: Pass inputPaths

Browse source
This commit is contained in:
Eelco Dolstra 2025-10-06 11:29:15 +02:00
parent 73e4c40e64
commit 6c0d67769d
2 changed files with 12 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/libstore/include/nix/store/globals.hh
View file

@ -1401,48 +1401,15 @@ public:
"builder": "/nix/store/s1qkj0ph…-bash-5.2p37/bin/bash", "builder": "/nix/store/s1qkj0ph…-bash-5.2p37/bin/bash",
"env": { "env": {
"HOME": "/homeless-shelter", "HOME": "/homeless-shelter",
"NIX_BUILD_CORES": "14",
"NIX_BUILD_TOP": "/build",
"NIX_LOG_FD": "2",
"NIX_STORE": "/nix/store",
"PATH": "/path-not-set",
"PWD": "/build",
"TEMP": "/build",
"TEMPDIR": "/build",
"TERM": "xterm-256color",
"TMP": "/build",
"TMPDIR": "/build",
"__structuredAttrs": "",
"buildInputs": "",
"builder": "/nix/store/s1qkj0ph…-bash-5.2p37/bin/bash", "builder": "/nix/store/s1qkj0ph…-bash-5.2p37/bin/bash",
"cmakeFlags": "",
"configureFlags": "",
"depsBuildBuild": "",
"depsBuildBuildPropagated": "",
"depsBuildTarget": "",
"depsBuildTargetPropagated": "",
"depsHostHost": "",
"depsHostHostPropagated": "",
"depsTargetTarget": "",
"depsTargetTargetPropagated": "",
"doCheck": "1",
"doInstallCheck": "1",
"mesonFlags": "",
"name": "hello-2.12.2",
"nativeBuildInputs": "/nix/store/l31j72f1…-version-check-hook", "nativeBuildInputs": "/nix/store/l31j72f1…-version-check-hook",
"out": "/nix/store/2yx2prgx…-hello-2.12.2", …
"outputs": "out",
"patches": "",
"pname": "hello",
"postInstallCheck": "stat \"${!outputBin}/bin/hello\"\n",
"propagatedBuildInputs": "",
"propagatedNativeBuildInputs": "",
"src": "/nix/store/dw402azx…-hello-2.12.2.tar.gz",
"stdenv": "/nix/store/i8bw5nqg…-stdenv-linux",
"strictDeps": "",
"system": "aarch64-linux",
"version": "2.12.2"
}, },
"inputPaths": [
"/nix/store/14dciax3mm8j70hjy4c0d68mds9ppx2s-glibc-2.32-54-dev",
"/nix/store/1azs5s8zc0z7m6sssvq1np0m7z873zml-gettext-0.21",
…
],
"realStoreDir": "/nix/store", "realStoreDir": "/nix/store",
"storeDir": "/nix/store", "storeDir": "/nix/store",
"system": "aarch64-linux", "system": "aarch64-linux",

6
src/libstore/unix/build/external-derivation-builder.cc
View file

@ -68,6 +68,12 @@ struct ExternalDerivationBuilder : DerivationBuilderImpl
json.emplace("storeDir", store.storeDir); json.emplace("storeDir", store.storeDir);
json.emplace("realStoreDir", store.config->realStoreDir.get()); json.emplace("realStoreDir", store.config->realStoreDir.get());
json.emplace("system", drv.platform); json.emplace("system", drv.platform);
{
auto l = nlohmann::json::array();
for (auto & i : inputPaths)
l.push_back(store.printStorePath(i));
json.emplace("inputPaths", std::move(l));
}
// TODO(cole-h): writing this to stdin is too much effort right now, if we want to revisit // TODO(cole-h): writing this to stdin is too much effort right now, if we want to revisit
// that, see this comment by Eelco about how to make it not suck: // that, see this comment by Eelco about how to make it not suck: