diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 16:33:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 16:33:33 +0000 |
| commit | 47adaa80e310ed270b2bccb05cf2c10d30cde453 (patch) | |
| tree | 27ff8c9be064967b0b264814fb7fee57137b87b0 /pkgs/applications/version-management/bazaar | |
| parent | 641834ddf6aa2e3876378f04ee4f47c3b2153542 (diff) | |
| download | nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar.gz nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar.bz2 nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar.lz nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar.xz nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.tar.zst nixpkgs-47adaa80e310ed270b2bccb05cf2c10d30cde453.zip | |
* Move the wrapPythonPrograms function into a separate setup hook
(wrapPython). svn path=/nixpkgs/branches/modular-python/; revision=26580
Diffstat (limited to 'pkgs/applications/version-management/bazaar')
| -rw-r--r-- | pkgs/applications/version-management/bazaar/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 4509d4f9b6e..71572f85fbc 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pythonPackages, makeWrapper }: +{ stdenv, fetchurl, python, pythonPackages, wrapPython }: stdenv.mkDerivation rec { version = "2.3"; @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { sha256 = "07kx41w4gqv68bcykdflsg68wvpmcyqknzyb4vr1zqlf27hahp53"; }; - buildInputs = [ python makeWrapper ]; + buildInputs = [ python wrapPython ]; + + pythonPath = [ pythonPackages.ssl ]; installPhase = '' python setup.py install --prefix=$out - wrapProgram $out/bin/bzr --prefix PYTHONPATH : "$(toPythonPath $out ${pythonPackages.ssl})" + wrapPythonPrograms ''; meta = { |