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

pythonPackages.tkinter: refactor move to python-modules

Browse Source
This commit is contained in:
Chris Ostrouchov 2018-10-28 11:34:55 -04:00
parent 8d26762f19
commit c3793aa1b1
No known key found for this signature in database
GPG Key ID: 9ED59B0AB1EAF573
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/python-modules/tkinter/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv
, buildPythonPackage
, python
, py
, isPyPy
}:
buildPythonPackage rec {
name = "tkinter-${python.version}";
src = py;
format = "other";
disabled = isPyPy;
installPhase = ''
# Move the tkinter module
mkdir -p $out/${py.sitePackages}
mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
# Update the rpath to point to python without x11Support
old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*)
new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" )
patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter*
'';
meta = py.meta;
}

21
pkgs/top-level/python-packages.nix
View File

@ -3977,26 +3977,7 @@ in {
# Python package.
tkinter = let
py = python.override{x11Support=true;};
in buildPythonPackage rec {
name = "tkinter-${python.version}";
src = py;
format = "other";
disabled = isPyPy;
installPhase = ''
# Move the tkinter module
mkdir -p $out/${py.sitePackages}
mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
# Update the rpath to point to python without x11Support
old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*)
new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" )
patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter*
'';
meta = py.meta;
};
in callPackage ../development/python-modules/tkinter { py = py; };
tlslite = buildPythonPackage rec {
name = "tlslite-${version}";