From b176d8541c981dfabd241c4b969d7bafe27aaa06 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Thu, 30 Apr 2009 08:29:29 +0000 Subject: [PATCH] Fix xlibs-wrapper infinite loop when python.full is set to true. svn path=/nixpkgs/trunk/; revision=15411 --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ea951d9d50..fbc35199a1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4469,7 +4469,13 @@ let xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit fetchurl stdenv pkgconfig freetype fontconfig libxslt expat libdrm libpng zlib perl mesa mesaHeaders - xkeyboard_config dbus hal python e2fsprogs openssl gperf m4; + xkeyboard_config dbus hal e2fsprogs openssl gperf m4; + + # !!! pythonBase is use instead of python because this cause an infinite + # !!! recursion when the flag python.full is set to true. Packages + # !!! contained in the loop are python, tk, xlibs-wrapper, libX11, + # !!! libxcd (and xcb-proto). + python = pythonBase; }); xorgReplacements = composedArgsAndFun (import ../servers/x11/xorg/replacements.nix) {