diff options
| author | tilpner <till@hoeppner.ws> | 2018-01-06 21:10:57 +0100 |
|---|---|---|
| committer | tilpner <till@hoeppner.ws> | 2018-01-06 21:10:57 +0100 |
| commit | d0601b6add0d68c31ad5ff1ceec3a8ce635c8e33 (patch) | |
| tree | 975aee8e8695f48d407ec986e160534eb947c6fb /pkgs/tools/backup/bup | |
| parent | 45f6d97e6e486602cb26a09d13c63619aafbd1b7 (diff) | |
| download | nixpkgs-d0601b6add0d68c31ad5ff1ceec3a8ce635c8e33.tar nixpkgs-d0601b6add0d68c31ad5ff1ceec3a8ce635c8e33.tar.gz nixpkgs-d0601b6add0d68c31ad5ff1ceec3a8ce635c8e33.tar.bz2 nixpkgs-d0601b6add0d68c31ad5ff1ceec3a8ce635c8e33.tar.lz nixpkgs-d0601b6add0d68c31ad5ff1ceec3a8ce635c8e33.tar.xz nixpkgs-d0601b6add0d68c31ad5ff1ceec3a8ce635c8e33.tar.zst nixpkgs-d0601b6add0d68c31ad5ff1ceec3a8ce635c8e33.zip | |
bup: PYTHONPATH -> withPackages
Without this, tornado was not found on startup (`bup web`), even though it was provided by PYTHONPATH Also see #22688
Diffstat (limited to 'pkgs/tools/backup/bup')
| -rw-r--r-- | pkgs/tools/backup/bup/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index d7c14a91efb..f24e89fcc84 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeWrapper +{ stdenv, fetchFromGitHub, makeWrapper , perl, pandoc, python2Packages, git , par2cmdline ? null, par2Support ? true }: @@ -19,7 +19,12 @@ stdenv.mkDerivation rec { 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 ]; postPatch = '' @@ -41,11 +46,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/bup \ - --prefix PATH : ${git}/bin \ - --prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})") - (with python2Packages; - [ setuptools tornado ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))} + --prefix PATH : ${git}/bin ''; meta = { |