From 0e7e7da6a155fd0d7cadecec0e2406c401414ca2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 15 Oct 2008 20:01:39 +0000
Subject: [PATCH] Adding possibility to have rich Python installation for
 development but use only the base one for, say, OpenOffice (and be able to
 use buildfarm). Codeville and Bazaar use the rich variant - they do have some
 use for it..

svn path=/nixpkgs/trunk/; revision=13075
---
 pkgs/top-level/all-packages.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fbe4a0674a..5ad962c02c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2002,17 +2002,20 @@ let
       libXt;
   };
 
-  python = python25;
+  python = if getConfig ["python" "full"] false then pythonFull else pythonBase;
+  python25 = if getConfig ["python" "full"] false then python25Full else python25Base;
+  pythonBase = python25Base;
+  pythonFull = python25Full;
 
   python24 = import ../development/interpreters/python/2.4 {
     inherit fetchurl stdenv zlib bzip2;
   };
 
-  python25base = composedArgsAndFun (import ../development/interpreters/python/2.5) {
+  python25Base = composedArgsAndFun (import ../development/interpreters/python/2.5) {
     inherit fetchurl stdenv zlib bzip2 gdbm;
   };
 
-  python25 = python25base.meta.function {
+  python25Full = python25Base.meta.function {
     db4 = if getConfig ["python" "db4Support"] false then db4 else null;
     sqlite = if getConfig ["python" "sqliteSupport"] false then sqlite else null;
     readline = if getConfig ["python" "readlineSupport"] false then readline else null;
@@ -5909,7 +5912,8 @@ let
   };
 
   bazaar = import ../applications/version-management/bazaar {
-    inherit fetchurl stdenv makeWrapper python;
+    inherit fetchurl stdenv makeWrapper;
+    python = pythonFull;
   };
 
   bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) {
@@ -6092,7 +6096,8 @@ let
   };
 
   codeville = builderDefsPackage (selectVersion ../applications/version-management/codeville "0.8.0") {
-    inherit makeWrapper python;
+    inherit makeWrapper;
+    python = pythonFull;
   };
 
   cua = import ../applications/editors/emacs-modes/cua {