diff options
| author | Nick Cao <nickcao@nichi.co> | 2022-04-01 19:50:06 +0800 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2022-04-16 10:22:39 +0200 |
| commit | 70d0e2456857dc10dd7d2654277fc1dd8d8cc216 (patch) | |
| tree | 2e001d53a59112dbf74107270f0862791cc44ba3 /nixos/modules/services/logging | |
| parent | 0e5bfe647de809ec361273d2eab25d3cd6919c65 (diff) | |
| download | nixpkgs-70d0e2456857dc10dd7d2654277fc1dd8d8cc216.tar nixpkgs-70d0e2456857dc10dd7d2654277fc1dd8d8cc216.tar.gz nixpkgs-70d0e2456857dc10dd7d2654277fc1dd8d8cc216.tar.bz2 nixpkgs-70d0e2456857dc10dd7d2654277fc1dd8d8cc216.tar.lz nixpkgs-70d0e2456857dc10dd7d2654277fc1dd8d8cc216.tar.xz nixpkgs-70d0e2456857dc10dd7d2654277fc1dd8d8cc216.tar.zst nixpkgs-70d0e2456857dc10dd7d2654277fc1dd8d8cc216.zip | |
nixos/logrotate: use packages from buildPackages in configuration checkPhase, fixing cross compilation
Diffstat (limited to 'nixos/modules/services/logging')
| -rw-r--r-- | nixos/modules/services/logging/logrotate.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 332a2a597ed..e6eb0552c9e 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -162,8 +162,8 @@ let # file exist, but we only have sandboxed users here so brown these # out. according to man page that means su, create and createolddir. # files required to exist also won't be present, so missingok is forced. - user=$(${pkgs.coreutils}/bin/id -un) - group=$(${pkgs.coreutils}/bin/id -gn) + user=$(${pkgs.buildPackages.coreutils}/bin/id -un) + group=$(${pkgs.buildPackages.coreutils}/bin/id -gn) sed -e "s/\bsu\s.*/su $user $group/" \ -e "s/\b\(create\s\+[0-9]*\s*\|createolddir\s\+[0-9]*\s\+\).*/\1$user $group/" \ -e "1imissingok" -e "s/\bnomissingok\b//" \ @@ -173,7 +173,7 @@ let # 'error:' at common log level, so we can use grep, taking care # to keep error codes set -o pipefail - if ! ${pkgs.logrotate}/sbin/logrotate --debug /tmp/logrotate.conf 2>&1 \ + if ! ${pkgs.buildPackages.logrotate}/sbin/logrotate --debug /tmp/logrotate.conf 2>&1 \ | ( ! grep "error:" ) > /tmp/logrotate-error; then echo "Logrotate configuration check failed." echo "The failing configuration (after adjustments to pass tests in sandbox) was:" |