From 0b27960dcc6092985d5a143c3712d8963dbd2d2c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 19 Oct 2020 23:00:43 -0700 Subject: [PATCH] python3Packages.pysideShiboken: fix build --- .../python-modules/pyside/shiboken.nix | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index c5561525db5..29dba5e8f5e 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,10 +1,23 @@ -{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36, isPy37 }: +{ lib, fetchurl, buildPythonPackage +, cmake +, libxml2 +, pkg-config +, libxslt +, pysideApiextractor +, pysideGeneratorrunner +, python +, sphinx +, qt4 +, isPy3k +, isPy35 +, isPy36 +, isPy37 +}: -# This derivation provides a Python module and should therefore be called via `python-packages.nix`. -# Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 buildPythonPackage rec { pname = "pyside-shiboken"; version = "1.2.4"; + disabled = !isPy3k; format = "other"; @@ -13,10 +26,11 @@ buildPythonPackage rec { sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; + nativeBuildInputs = [ cmake pkg-config pysideApiextractor pysideGeneratorrunner sphinx qt4 ]; + + buildInputs = [ python libxml2 libxslt ]; preConfigure = '' echo "preConfigure: Fixing shiboken_generator install target." @@ -27,7 +41,11 @@ buildPythonPackage rec { # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86 patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch); - cmakeFlags = lib.optional isPy3k "-DUSE_PYTHON3=TRUE"; + cmakeFlags = lib.optionals isPy3k [ + "-DUSE_PYTHON3=TRUE" + "-DPYTHON3_INCLUDE_DIR=${lib.getDev python}/include/${python.libPrefix}" + "-DPYTHON3_LIBRARY=${lib.getLib python}/lib" + ]; meta = { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";