public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix xlibs-wrapper infinite loop when python.full is set to true. 

svn path=/nixpkgs/trunk/; revision=15411
This commit is contained in:
Nicolas Pierron 2009-04-30 08:29:29 +00:00
parent fac6cc37f2
commit b176d8541c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -4469,7 +4469,13 @@ let
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
inherit fetchurl stdenv pkgconfig freetype fontconfig inherit fetchurl stdenv pkgconfig freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa mesaHeaders 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) { xorgReplacements = composedArgsAndFun (import ../servers/x11/xorg/replacements.nix) {