diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2020-05-12 15:37:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 15:37:38 +0200 |
| commit | fea63944fd4b9afa41e5f91db795765d0f8e5463 (patch) | |
| tree | 6098d085d18e12590f04a4ee24e25325ba30bb34 /nixos | |
| parent | 6be178c50145853789d0c992fc5e6cee35308609 (diff) | |
| parent | c46b26b9ad63d6f6f0e4e16bb0a660dd937032e1 (diff) | |
| download | nixpkgs-fea63944fd4b9afa41e5f91db795765d0f8e5463.tar nixpkgs-fea63944fd4b9afa41e5f91db795765d0f8e5463.tar.gz nixpkgs-fea63944fd4b9afa41e5f91db795765d0f8e5463.tar.bz2 nixpkgs-fea63944fd4b9afa41e5f91db795765d0f8e5463.tar.lz nixpkgs-fea63944fd4b9afa41e5f91db795765d0f8e5463.tar.xz nixpkgs-fea63944fd4b9afa41e5f91db795765d0f8e5463.tar.zst nixpkgs-fea63944fd4b9afa41e5f91db795765d0f8e5463.zip | |
Merge pull request #87280 from helsinki-systems/znapzend-mbuffer-path
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/backup/znapzend.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index 98cd647f61a..134966a5a35 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -268,7 +268,8 @@ let mkSrcAttrs = srcCfg: with srcCfg; { enabled = onOff enable; - mbuffer = with mbuffer; if enable then "${pkgs.mbuffer}/bin/mbuffer" + # mbuffer is not referenced by its full path to accomodate non-NixOS systems or differing mbuffer versions between source and target + mbuffer = with mbuffer; if enable then "mbuffer" + optionalString (port != null) ":${toString port}" else "off"; mbuffer_size = mbuffer.size; post_znap_cmd = nullOff postsnap; |