From d031891c6bf151ef31517c1bc633ff21ecee864a Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 9 Apr 2018 13:57:42 -0700 Subject: [PATCH] btrbk: clean up build inputs --- pkgs/tools/backup/btrbk/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index dd10eeb8e5a9..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 -, utillinux, 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c493337c161..1ff50d20958c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -886,7 +886,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 { };