diff options
| author | jhhuh <jihaeng.huh@gmail.com> | 2016-10-09 16:54:51 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-10-09 16:54:51 +0200 |
| commit | 89cbb88d26c5620bf91bafc00bf77878211c8c40 (patch) | |
| tree | 60cd24878542639cd9762f3ff28dd5c3f33de733 /pkgs/tools/backup/bup | |
| parent | fd38aeafcd003c93676983dde4dd66dfa20ff765 (diff) | |
| download | nixpkgs-89cbb88d26c5620bf91bafc00bf77878211c8c40.tar nixpkgs-89cbb88d26c5620bf91bafc00bf77878211c8c40.tar.gz nixpkgs-89cbb88d26c5620bf91bafc00bf77878211c8c40.tar.bz2 nixpkgs-89cbb88d26c5620bf91bafc00bf77878211c8c40.tar.lz nixpkgs-89cbb88d26c5620bf91bafc00bf77878211c8c40.tar.xz nixpkgs-89cbb88d26c5620bf91bafc00bf77878211c8c40.tar.zst nixpkgs-89cbb88d26c5620bf91bafc00bf77878211c8c40.zip | |
bup-0.28.1: fix on darwin, upstream released patch removed
Diffstat (limited to 'pkgs/tools/backup/bup')
| -rw-r--r-- | pkgs/tools/backup/bup/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index f1774507225..075f1653adf 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -22,12 +22,6 @@ stdenv.mkDerivation rec { buildInputs = [ git pythonPackages.python ]; nativeBuildInputs = [ pandoc perl makeWrapper ]; - patches = optional stdenv.isDarwin (fetchurl { - url = "https://github.com/bup/bup/commit/75d089e7cdb7a7eb4d69c352f56dad5ad3aa1f97.diff"; - sha256 = "05kp47p30a45ip0fg090vijvzc7ijr0alc3y8kjl6bvv3gliails"; - name = "darwin_10_10.patch"; - }); - postPatch = '' patchShebangs . substituteInPlace Makefile --replace "-Werror" "" @@ -49,7 +43,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bup \ --prefix PATH : ${git}/bin \ --prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})") - (with pythonPackages; [ pyxattr pylibacl setuptools fuse tornado ]))} + (with pythonPackages; + [ setuptools tornado ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))} ''; meta = { |