From 99f01c15faf8cfffa4e51c11c015f31a308506cd Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Mon, 3 Feb 2025 13:05:58 +0100 Subject: [PATCH] pypy3Packages.tkinter: enable and make no-op PyPy always includes the tkinter module without further setup. --- pkgs/development/python-modules/tkinter/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix index e051bbf86d98db..f1fe4d1a0b2528 100644 --- a/pkgs/development/python-modules/tkinter/default.nix +++ b/pkgs/development/python-modules/tkinter/default.nix @@ -13,9 +13,8 @@ buildPythonPackage { src = py; format = "other"; - disabled = isPyPy; - - installPhase = + # tkinter is included in PyPy, making this package a no-op. + installPhase = lib.optionalString (!isPyPy) ( '' # Move the tkinter module mkdir -p $out/${py.sitePackages} @@ -26,7 +25,8 @@ buildPythonPackage { 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 // { # Based on first sentence from https://docs.python.org/3/library/tkinter.html