diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-18 00:40:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-18 00:40:58 +0000 |
commit | 683536ab2aa9dc67cf03effbc5d8372842a20b00 (patch) | |
tree | f55a0215257c697272d942129037205011eafbb5 /pkgs/tools/system | |
parent | afcea016141370a8ba1e398f613cb42988a11b17 (diff) | |
parent | fd2233556f006f038e19ef5741091a858458a0d9 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/logrotate/default.nix | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 513b48c66304e..e91cd6da6b97e 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -14,27 +14,21 @@ stdenv.mkDerivation rec { }; # Logrotate wants to access the 'mail' program; to be done. - patchPhase = '' - sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ - -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' configure.ac - - ${lib.optionalString (mailutils != null) '' - sed -i -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac - ''} - ''; - - autoreconfPhase = '' - ./autogen.sh - ''; + configureFlags = [ + "--with-compress-command=${gzip}/bin/gzip" + "--with-uncompress-command=${gzip}/bin/gunzip" + ] ++ lib.optionals (mailutils != null) [ + "--with-default-mail-command=${mailutils}/bin/mail" + ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ popt ]; - meta = { + meta = with lib; { homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; description = "Rotates and compresses system logs"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.viric ]; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.all; }; } |