diff options
| author | Atemu <atemu.main@gmail.com> | 2024-04-18 09:04:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-18 09:04:41 +0200 |
| commit | 3bdc0e7715d93c3e5f153e67c0d56a3fdf107529 (patch) | |
| tree | 4280daa39ff1cb9a3e659333e9abfaada5d91148 /nixos | |
| parent | 056a59b8a9d656604755005b900d53920b8903a2 (diff) | |
| parent | 6fd2d4b541264932bcbec137a1c3ec39053e8c69 (diff) | |
Merge pull request #304810 from ju1m/dnscrypt-proxy2
nixos/dnscrypt-proxy2: fix cross-compiling
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/dnscrypt-proxy2.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/dnscrypt-proxy2.nix b/nixos/modules/services/networking/dnscrypt-proxy2.nix index 6272045efe281..980eda117b1eb 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -49,12 +49,12 @@ in passAsFile = [ "json" ]; } '' ${if cfg.upstreamDefaults then '' - ${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json - ${pkgs.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two + ${pkgs.buildPackages.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json + ${pkgs.buildPackages.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two '' else '' cp $jsonPath config.json ''} - ${pkgs.remarshal}/bin/json2toml < config.json > $out + ${pkgs.buildPackages.remarshal}/bin/json2toml < config.json > $out ''; defaultText = literalMD "TOML file generated from {option}`services.dnscrypt-proxy2.settings`"; }; |