nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 11:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3Packages.mayavi: fix build with Python 3.11 and clang 16

Browse Source 
* Apply a patch from upstream that adds Python 3.11 compatibility; and
* Apply a patch that fixes an incompatible function pointer conversion.
This commit is contained in:
Randy Eckenrode 2023-11-10 00:07:56 -05:00
parent 3e7992ba67
commit f409f152d2
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/python-modules/mayavi/default.nix
View File

@ -3,6 +3,7 @@
, buildPythonPackage
, envisage
, fetchPypi
, fetchpatch
, numpy
, packaging
, pyface
@ -26,6 +27,24 @@ buildPythonPackage rec {
hash = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4=";
};
patches = [
# Adds compatibility with Python 3.11.
# https://github.com/enthought/mayavi/pull/1199
(fetchpatch {
name = "python311-compat.patch";
url = "https://github.com/enthought/mayavi/commit/50c0cbfcf97560be69c84b7c924635a558ebf92f.patch";
hash = "sha256-zZOT6on/f5cEjnDBrNGog/wPQh7rBkaFqrxkBYDUQu0=";
includes = [ "tvtk/src/*" ];
})
# Fixes an incompatible function pointer conversion error
# https://github.com/enthought/mayavi/pull/1266
(fetchpatch {
name = "incompatible-pointer-conversion.patch";
url = "https://github.com/enthought/mayavi/commit/887adc8fe2b076a368070f5b1d564745b03b1964.patch";
hash = "sha256-88H1NNotd4pO0Zw1oLrYk5WNuuVrmTU01HJgsTRfKlo=";
})
];
postPatch = ''
# building the docs fails with the usual Qt xcb error, so skip:
substituteInPlace setup.py \