From dfde99fd70050d75307eae7e30bc0cd249c9f2a7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 10 Jun 2026 15:18:50 +0200 Subject: [PATCH] formats.javaProperties: use structuredAttrs instead of passAsFile Tested via `nix-build -A tests.pkgs-lib.java-properties` --- pkgs/pkgs-lib/formats/java-properties/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/pkgs-lib/formats/java-properties/default.nix b/pkgs/pkgs-lib/formats/java-properties/default.nix index f94663a9b386..27ecdfec0dfe 100644 --- a/pkgs/pkgs-lib/formats/java-properties/default.nix +++ b/pkgs/pkgs-lib/formats/java-properties/default.nix @@ -106,13 +106,14 @@ in # general. preferLocalBuild = true; - passAsFile = [ "value" ]; value = builtins.toJSON value; nativeBuildInputs = [ jq libiconvReal ]; + __structuredAttrs = true; + jqCode = let main = '' @@ -151,7 +152,7 @@ in ( echo "$comment" | while read -r ln; do echo "# $ln"; done echo - jq -r --arg hash '#' "$jqCode" "$valuePath" \ + printf "%s" "$value" | jq -r --arg hash '#' "$jqCode" \ | iconv --from-code "$inputEncoding" --to-code JAVA \ ) > "$out" ''