From b159ed50695350430c8effa79796bd9f4836e79c Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Wed, 15 Nov 2017 16:52:26 +0100 Subject: [PATCH 1/2] borgbackup: Add acl library to build inputs on linux platform The acl libraray is only required by the borgbackup package if building on a linux platform. Adding it only in this case should be fine. Also see the conditional in the setup.py at [1]. [1] https://github.com/borgbackup/borg/blob/72232a9bd573aeb4818b36c9c8764b6008e9283e/setup.py#L768 --- pkgs/tools/backup/borg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 6395b91fa73a..015f0524155b 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -16,8 +16,8 @@ python3Packages.buildPythonApplication rec { sphinx guzzle_sphinx_theme ]; buildInputs = [ - acl lz4 openssl python3Packages.setuptools_scm - ]; + lz4 openssl python3Packages.setuptools_scm + ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3Packages; [ cython llfuse msgpack ]; From 629e17b9fdfcb61d6896e424edda91abab7bcd41 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Wed, 15 Nov 2017 16:54:22 +0100 Subject: [PATCH 2/2] borgbackup: Add llfuse to propagated build inputs if not on darwin The llfuse package depends on fuse which refuses to build on darwin. But according to a comment in the setup.py of borgbackup [1] it's ok to leave it out if it's not available. Most of borgbackup should work without it. Would be great to make it work on darwin but i am not sure if it's possible to get fuse to work on darwin. I do not know enough about it ;) After this modification at least the "borg mount" subcommand is broken due to the missing llfuse module. But the rest seems to work normally. [1] https://github.com/borgbackup/borg/blob/72232a9bd573aeb4818b36c9c8764b6008e9283e/setup.py#L32 --- pkgs/tools/backup/borg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 015f0524155b..867d2cf903a0 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -19,8 +19,8 @@ python3Packages.buildPythonApplication rec { lz4 openssl python3Packages.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3Packages; [ - cython llfuse msgpack - ]; + cython msgpack + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ]; preConfigure = '' export BORG_OPENSSL_PREFIX="${openssl.dev}"