diff options
| -rw-r--r-- | pkgs/tools/backup/btrbk/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ace543186651..958afa3f6a9c 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages -, asciidoc-full, makeWrapper }: +, utillinux, asciidoc, makeWrapper }: stdenv.mkDerivation rec { name = "btrbk-${version}"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp"; }; - buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ]; + nativeBuildInputs = [ asciidoc makeWrapper ]; + + buildInputs = with perlPackages; [ perl DateCalc ]; preInstall = '' for f in $(find . -name Makefile); do @@ -27,6 +29,10 @@ stdenv.mkDerivation rec { --replace "/bin/date" "${coreutils}/bin/date" \ --replace "/bin/echo" "${coreutils}/bin/echo" \ --replace '$btrbk' 'btrbk' + + # Fix SSH filter script + sed -i '/^export PATH/d' ssh_filter_btrbk.sh + substituteInPlace ssh_filter_btrbk.sh --replace logger ${utillinux}/bin/logger ''; preFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f725866633e1..88cdf7a4d52e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -891,7 +891,9 @@ with pkgs; btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; - btrbk = callPackage ../tools/backup/btrbk { }; + btrbk = callPackage ../tools/backup/btrbk { + asciidoc = asciidoc-full; + }; buildtorrent = callPackage ../tools/misc/buildtorrent { }; |