From 47adaa80e310ed270b2bccb05cf2c10d30cde453 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Mar 2011 16:33:33 +0000
Subject: * Move the wrapPythonPrograms function into a separate setup hook  
 (wrapPython).

svn path=/nixpkgs/branches/modular-python/; revision=26580
---
 pkgs/applications/version-management/bazaar/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pkgs/applications/version-management/bazaar')

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 = {
-- 
cgit 1.4.1