From 54d9d20dc9fa076a0d836b174512fa3ece9fbbf9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 12 May 2023 08:45:37 +0300 Subject: [PATCH] python310Packages.pyside6: cleanup --- .../development/python-modules/pyside6/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 174feb8b230d..0cf06e885c13 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -4,6 +4,7 @@ , ninja , qt6 , python +, moveBuildTree , shiboken6 , libxcrypt }: @@ -15,7 +16,9 @@ stdenv.mkDerivation rec { sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; - postPatch = '' + # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS + # reside in the same directory as QtCore.framework, which is not true for Nix. + postPatch = lib.optionalString stdenv.isLinux '' # Don't ignore optional Qt modules substituteInPlace cmake/PySideHelpers.cmake \ --replace \ @@ -27,11 +30,14 @@ stdenv.mkDerivation rec { cmake ninja python + ] ++ lib.optionals stdenv.isDarwin [ + moveBuildTree ]; buildInputs = with qt6; [ # required qtbase + ] ++ lib.optionals stdenv.isLinux [ # optional qt3d qtcharts @@ -51,10 +57,6 @@ stdenv.mkDerivation rec { qtwebchannel qtwebengine qtwebsockets - ] ++ lib.optionals (python.pythonOlder "3.9") [ - # see similar issue: 202262 - # libxcrypt is required for crypt.h for building older python modules - libxcrypt ]; propagatedBuildInputs = [ @@ -72,6 +74,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl3Only gpl2Only gpl3Only ]; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner Enzime ]; - broken = stdenv.isDarwin; + platforms = platforms.all; }; }