public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38660 from tadfisher/btrbk 

btrbk: fix SSH filter script; clean up build inputs
This commit is contained in:
Matthew Justin Bauer 2018-05-04 17:26:02 -05:00 committed by GitHub
parent 22a88fccb1 d031891c6b
commit 54fa425696
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/backup/btrbk/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
, asciidoc-full, makeWrapper }: , utillinux, asciidoc, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "btrbk-${version}"; name = "btrbk-${version}";
@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp"; sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp";
}; };
buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ]; nativeBuildInputs = [ asciidoc makeWrapper ];
buildInputs = with perlPackages; [ perl DateCalc ];
preInstall = '' preInstall = ''
for f in $(find . -name Makefile); do for f in $(find . -name Makefile); do
@ -27,6 +29,10 @@ stdenv.mkDerivation rec {
--replace "/bin/date" "${coreutils}/bin/date" \ --replace "/bin/date" "${coreutils}/bin/date" \
--replace "/bin/echo" "${coreutils}/bin/echo" \ --replace "/bin/echo" "${coreutils}/bin/echo" \
--replace '$btrbk' 'btrbk' --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 = '' preFixup = ''

4
pkgs/top-level/all-packages.nix
View File

@ -891,7 +891,9 @@ with pkgs;
btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; 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 { }; buildtorrent = callPackage ../tools/misc/buildtorrent { };