treewide: move tcl libraries under tclPackages
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
, openssl
|
||||
, readline
|
||||
, sqlite
|
||||
, tcl ? null, tk ? null, tix ? null, libX11 ? null, x11Support ? false
|
||||
, tcl ? null, tk ? null, tclPackages, libX11 ? null, x11Support ? false
|
||||
, zlib
|
||||
, self
|
||||
, configd, coreutils
|
||||
@@ -273,8 +273,8 @@ in with passthru; stdenv.mkDerivation ({
|
||||
|
||||
setupHook = python-setup-hook sitePackages;
|
||||
|
||||
postPatch = lib.optionalString (x11Support && (tix != null)) ''
|
||||
substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
postPatch = lib.optionalString (x11Support && ((tclPackages.tix or null) != null)) ''
|
||||
substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
|
||||
Reference in New Issue
Block a user