diff --git a/escape.nix b/escape.nix index 934fe53..d207702 100644 --- a/escape.nix +++ b/escape.nix @@ -44,12 +44,12 @@ lib: let else lib.strings.escapeXML string; - raw = string: derivation { + raw = string: toString (derivation { name = "_"; system = "_"; builder = "_"; rawContent = "${startMarker}${yeet string}${endMarker}"; - }; + }); in { inherit escape raw; } diff --git a/flake.nix b/flake.nix index 7ee5758..32613b1 100644 --- a/flake.nix +++ b/flake.nix @@ -43,8 +43,8 @@ outPath = dottedNameToTag name; __functor = this: next: - # Not an attrset or an escaped one. Just toString it and add it onto the HTML. - if builtins.isAttrs next -> lib.hasSuffix "-_" next.outPath or "" + # Not an attrset. Just add it onto the HTML. + if !builtins.isAttrs next then this // { outPath = (toString this) + escape (toString next); }