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

Fix usage of structured attrs for nix develop

Browse source
This commit is contained in:
Maximilian Bosch 2021-05-13 01:20:49 +02:00
parent 3944a120ec
commit 447928bdb5
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/nix/develop.cc
View file

@ -256,6 +256,11 @@ struct Common : InstallableCommand, MixProfile
// FIXME: properly unquote 'outputs'. // FIXME: properly unquote 'outputs'.
StringMap rewrites; StringMap rewrites;
for (auto & outputName : tokenizeString<std::vector<std::string>>(replaceStrings(outputs->second.quoted, "'", ""))) { for (auto & outputName : tokenizeString<std::vector<std::string>>(replaceStrings(outputs->second.quoted, "'", ""))) {
std::regex ptrn(R"re(\[([A-z0-9]+)\]=.*)re");
std::smatch match;
if (std::regex_match(outputName, match, ptrn)) {
outputName = match[1];
}
auto from = buildEnvironment.env.find(outputName); auto from = buildEnvironment.env.find(outputName);
assert(from != buildEnvironment.env.end()); assert(from != buildEnvironment.env.end());
// FIXME: unquote // FIXME: unquote

8
src/nix/get-env.sh
View file

@ -8,7 +8,13 @@ if [[ -n $stdenv ]]; then
source $stdenv/setup source $stdenv/setup
fi fi
for __output in $outputs; do if [ -e .attrs.sh ]; then
__olist="${!outputs[@]}"
else
__olist=$outputs
fi
for __output in $__olist; do
if [[ -z $__done ]]; then if [[ -z $__done ]]; then
export > ${!__output} export > ${!__output}
set >> ${!__output} set >> ${!__output}