diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-14 17:49:51 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-16 14:31:26 +0200 |
commit | 107c035bf04e1b7d133d31cf8f8d6a44ef6ae136 (patch) | |
tree | 5ed17d08205a74ba6c0954a8127e2b60f12b58d4 /pkgs/development/interpreters/python/cpython/2.7/default.nix | |
parent | 80433e70302be5498f07996d04bacb4cecfc6a7b (diff) |
Python: remove pythonSmall
In #19309 a separate output for tkinter was added. Several dependencies of Python depend indirectly on Python. We have the following two paths: ``` ‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘libXrender-0.9.10’ - ‘libX11-1.6.4’ - ‘libxcb-1.12’ - ‘libxslt-1.1.29’- ‘libxml2-2.9.4’ - ‘python-2.7.12’ ‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘fontconfig-2.12.1’ - ‘dejavu-fonts-2.37’ - ‘fontforge-20160404’ - ‘python-2.7.12’ ``` Because only `tkinter` needs this, I added ``` pythonSmall = python.override {x11Support = false;}; ``` to break the infinite recursion. We also still have the output `tkinter`. However, we might as well build without x11Support by default. Then we build with x11Support as well so we get the tkinter module and put that in a separate package.
Diffstat (limited to 'pkgs/development/interpreters/python/cpython/2.7/default.nix')
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index b1c64020fe9a6..aa4fca9bf3560 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -6,7 +6,7 @@ , openssl , readline , sqlite -, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? !stdenv.isCygwin +, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? false , zlib , callPackage , self @@ -170,14 +170,6 @@ in stdenv.mkDerivation { rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev ''; - postFixup = optionalString x11Support '' - # tkinter goes in a separate output - mkdir -p $tkinter/${sitePackages} - mv $out/lib/${libPrefix}/lib-dynload/_tkinter* $tkinter/${sitePackages}/ - ''; - - outputs = ["out"] ++ optional x11Support "tkinter"; - passthru = rec { inherit libPrefix sitePackages x11Support; executable = libPrefix; |