diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2020-08-14 17:19:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-14 17:19:19 +0200 |
commit | 13e49be6602314fe5e5d7beb8a807d5d892e864e (patch) | |
tree | e9dcdbcf58e0b45eb2abc068e9f475a28204c7be /src/nix/repl.cc | |
parent | 7714d9a943bd36e984a1531fbc367ce124fc94da (diff) | |
parent | 1d2e80ddd669ef6da94c0f8c8ad734c1b0cf7d10 (diff) |
Merge pull request #3875 from obsidiansystems/new-interface-for-path-pathOpt
Offer a safer interface for path and pathOpt
Diffstat (limited to 'src/nix/repl.cc')
-rw-r--r-- | src/nix/repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/repl.cc b/src/nix/repl.cc index c3c9e54a8..a74655200 100644 --- a/src/nix/repl.cc +++ b/src/nix/repl.cc @@ -490,8 +490,8 @@ bool NixRepl::processLine(string line) if (runProgram(settings.nixBinDir + "/nix", Strings{"build", "--no-link", drvPath}) == 0) { auto drv = readDerivation(*state->store, drvPath, Derivation::nameFromPath(state->store->parseStorePath(drvPath))); std::cout << std::endl << "this derivation produced the following outputs:" << std::endl; - for (auto & i : drv.outputs) - std::cout << fmt(" %s -> %s\n", i.first, state->store->printStorePath(i.second.path(*state->store, drv.name))); + for (auto & i : drv.outputsAndPaths(*state->store)) + std::cout << fmt(" %s -> %s\n", i.first, state->store->printStorePath(i.second.second)); } } else if (command == ":i") { runProgram(settings.nixBinDir + "/nix-env", Strings{"-i", drvPath}); |