diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 5826ed7be1606..9d6a3c6407986 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -1,5 +1,13 @@ -{ python, fetchurl, lib, stdenv, - cmake, ninja, qt5, shiboken2 }: +{ python +, fetchurl +, lib +, stdenv +, cmake +, libxcrypt +, ninja +, qt5 +, shiboken2 +}: stdenv.mkDerivation rec { pname = "pyside2"; @@ -26,12 +34,29 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${qt5.qtdeclarative.dev}/include/QtQuick/${qt5.qtdeclarative.version}/QtQuick"; nativeBuildInputs = [ cmake ninja qt5.qmake python ]; + buildInputs = (with qt5; [ - qtbase qtxmlpatterns qtmultimedia qttools qtx11extras qtlocation qtscript - qtwebsockets qtwebengine qtwebchannel qtcharts qtsensors qtsvg - ]) ++ [ - python.pkgs.setuptools - ]; + qtbase + qtxmlpatterns + qtmultimedia + qttools + qtx11extras + qtlocation + qtscript + qtwebsockets + qtwebengine + qtwebchannel + qtcharts + qtsensors + qtsvg + ]) ++ (with python.pkgs; [ + setuptools + ]) ++ (lib.optionals (python.pythonOlder "3.9") [ + # see similar issue: 202262 + # libxcrypt is required for crypt.h for building older python modules + libxcrypt + ]); + propagatedBuildInputs = [ shiboken2 ]; dontWrapQtApps = true; diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index c4210cfeda2ec..53ea30ca68235 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -1,5 +1,12 @@ -{ python, lib, stdenv, pyside2 -, cmake, qt5, llvmPackages }: +{ python +, lib +, stdenv +, pyside2 +, cmake +, qt5 +, libxcrypt +, llvmPackages +}: stdenv.mkDerivation { pname = "shiboken2"; @@ -17,7 +24,18 @@ stdenv.mkDerivation { CLANG_INSTALL_DIR = llvmPackages.libclang.out; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.libclang python python.pkgs.setuptools qt5.qtbase qt5.qtxmlpatterns ]; + + buildInputs = [ + llvmPackages.libclang + python + python.pkgs.setuptools + qt5.qtbase + qt5.qtxmlpatterns + ] ++ (lib.optionals (python.pythonOlder "3.9") [ + # see similar issue: 202262 + # libxcrypt is required for crypt.h for building older python modules + libxcrypt + ]); cmakeFlags = [ "-DBUILD_TESTS=OFF"