Skip to content

Python pyside2/shiboken2: fix build issue for older python versions using libxcrypt #207829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjornfor merged 2 commits into from
Dec 26, 2022
Merged

Python pyside2/shiboken2: fix build issue for older python versions using libxcrypt #207829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e807775
python.pkgs.shiboken2: bugfix
hellwolf Dec 26, 2022
9ad22eb
python.pkgs.pyside2: bugfix
hellwolf Dec 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 32 additions & 7 deletions pkgs/development/python-modules/pyside2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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;
Expand Down
24 changes: 21 additions & 3 deletions pkgs/development/python-modules/shiboken2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{ python, lib, stdenv, pyside2
, cmake, qt5, llvmPackages }:
{ python
, lib
, stdenv
, pyside2
, cmake
, qt5
, libxcrypt
, llvmPackages
}:

stdenv.mkDerivation {
pname = "shiboken2";
Expand All @@ -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"
Expand Down