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

bup: PYTHONPATH -> withPackages

Browse Source 
Without this, tornado was not found on startup (`bup web`),
even though it was provided by PYTHONPATH

Also see #22688
This commit is contained in:
tilpner 2018-01-06 21:10:57 +01:00
parent 45f6d97e6e
commit d0601b6add
No known key found for this signature in database
GPG Key ID: 6A13327225BE51F6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchurl, makeWrapper { stdenv, fetchFromGitHub, makeWrapper
, perl, pandoc, python2Packages, git , perl, pandoc, python2Packages, git
, par2cmdline ? null, par2Support ? true , par2cmdline ? null, par2Support ? true
}: }:
@ -19,7 +19,12 @@ stdenv.mkDerivation rec {
sha256 = "0wdr399jf64zzzsdvldhrwvnh5xpbghjvslr1j2cwr5y4i36znxf"; sha256 = "0wdr399jf64zzzsdvldhrwvnh5xpbghjvslr1j2cwr5y4i36znxf";
}; };
buildInputs = [ git python2Packages.python ]; buildInputs = [
git
(python2Packages.python.withPackages
(p: with p; [ setuptools tornado ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))
];
nativeBuildInputs = [ pandoc perl makeWrapper ]; nativeBuildInputs = [ pandoc perl makeWrapper ];
postPatch = '' postPatch = ''
@ -41,11 +46,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/bup \ wrapProgram $out/bin/bup \
--prefix PATH : ${git}/bin \ --prefix PATH : ${git}/bin
--prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})")
(with python2Packages;
[ setuptools tornado ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))}
''; '';
meta = { meta = {