tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom

pythonPackages.pysideShiboken: fix build with python 3.9

authored by

J. Neto and committed by
Jonathan Ringer 2e03ce94 bcc99b83

+13 -5
+13 -5
pkgs/development/python-modules/pyside/shiboken.nix
··· 1 1 { lib, fetchFromGitHub, buildPythonPackage 2 2 , cmake 3 - , isPy35 4 - , isPy36 5 - , isPy37 3 + , fetchurl 6 4 , isPy3k 7 5 , libxml2 8 6 , libxslt ··· 8 10 , pysideApiextractor 9 11 , pysideGeneratorrunner 10 12 , python 13 + , pythonAtLeast 11 14 , qt4 12 15 , sphinx 13 16 }: ··· 38 39 \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ 39 40 ''; 40 41 41 - # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86 42 - patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch); 42 + patches = [ 43 + # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86 44 + ./gcc6.patch 45 + (lib.optional (pythonAtLeast "3.5") ./shiboken_py35.patch) 46 + (fetchurl { 47 + # https://github.com/pyside/Shiboken/pull/90 48 + name = "fix-build-with-python-3.9.patch"; 49 + url = "https://github.com/pyside/Shiboken/commit/d1c901d4c0af581003553865360ba964cda041e8.patch"; 50 + sha256 = "1f7slz8n8rps5r67hz3hi4rr82igc3l166shfy6647ivsb2fnxwy"; 51 + }) 52 + ]; 43 53 44 54 cmakeFlags = lib.optionals isPy3k [ 45 55 "-DUSE_PYTHON3=TRUE"