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

prometheus: use runCommandNoCCLocal for config gen

Browse Source
This commit is contained in:
Robin Gloster 2020-04-12 20:11:36 +02:00
parent eb54aa1f6c
commit 0e040d16e8
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/monitoring/prometheus/default.nix
View File

@ -10,7 +10,7 @@ let
# a wrapper that verifies that the configuration is valid # a wrapper that verifies that the configuration is valid
promtoolCheck = what: name: file: promtoolCheck = what: name: file:
if cfg.checkConfig then if cfg.checkConfig then
pkgs.runCommand pkgs.runCommandNoCCLocal
"${name}-${replaceStrings [" "] [""] what}-checked" "${name}-${replaceStrings [" "] [""] what}-checked"
{ buildInputs = [ cfg.package ]; } '' { buildInputs = [ cfg.package ]; } ''
ln -s ${file} $out ln -s ${file} $out
@ -19,7 +19,7 @@ let
# Pretty-print JSON to a file # Pretty-print JSON to a file
writePrettyJSON = name: x: writePrettyJSON = name: x:
pkgs.runCommand name { preferLocalBuild = true; } '' pkgs.runCommandNoCCLocal name {} ''
echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out
''; '';