gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib.generators: made toLua accept derivations too

Browse Source 
While trying to extend generateLuarocksConfig, I had infinite loops caused by toLua considering derivations as attrSets
This commit is contained in:
Matthieu Coudron
2023-12-14 22:41:50 +01:00
parent d4af6e420f
commit 4ea6c0c58b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/generators.nix
View File

@@ -525,6 +525,8 @@ ${expr "" v}
"(${v.expr})" "(${v.expr})"
else if v == { } then else if v == { } then
"{}" "{}"
else if libAttr.isDerivation v then
''"${toString v}"''
else else
"{${introSpace}${concatItems ( "{${introSpace}${concatItems (
lib.attrsets.mapAttrsToList (key: value: "[${builtins.toJSON key}] = ${toLua innerArgs value}") v lib.attrsets.mapAttrsToList (key: value: "[${builtins.toJSON key}] = ${toLua innerArgs value}") v