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

bup-0.28.1: fix on darwin, upstream released patch removed

Browse Source
This commit is contained in:
jhhuh 2016-10-09 16:54:51 +02:00 committed by Robin Gloster
parent fd38aeafcd
commit 89cbb88d26
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,12 +22,6 @@ stdenv.mkDerivation rec {
buildInputs = [ git pythonPackages.python ]; buildInputs = [ git pythonPackages.python ];
nativeBuildInputs = [ pandoc perl makeWrapper ]; 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 = '' postPatch = ''
patchShebangs . patchShebangs .
substituteInPlace Makefile --replace "-Werror" "" substituteInPlace Makefile --replace "-Werror" ""
@ -49,7 +43,9 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/bup \ wrapProgram $out/bin/bup \
--prefix PATH : ${git}/bin \ --prefix PATH : ${git}/bin \
--prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})") --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 = { meta = {