diff options
| author | Silvan Mosberger <silvan.mosberger@tweag.io> | 2023-11-09 19:00:28 +0100 |
|---|---|---|
| committer | Silvan Mosberger <silvan.mosberger@tweag.io> | 2023-11-09 19:01:58 +0100 |
| commit | fb2e311d1e1d95a78cdb9aab8d1d724e187f1ba1 (patch) | |
| tree | 30ba428b73c269bffb7940705e3953eb4e6f084a /pkgs/applications/science | |
| parent | d335849f83b876b64ac55c99138480b63ddfac15 (diff) | |
| download | nixpkgs-fb2e311d1e1d95a78cdb9aab8d1d724e187f1ba1.tar nixpkgs-fb2e311d1e1d95a78cdb9aab8d1d724e187f1ba1.tar.gz nixpkgs-fb2e311d1e1d95a78cdb9aab8d1d724e187f1ba1.tar.bz2 nixpkgs-fb2e311d1e1d95a78cdb9aab8d1d724e187f1ba1.tar.lz nixpkgs-fb2e311d1e1d95a78cdb9aab8d1d724e187f1ba1.tar.xz nixpkgs-fb2e311d1e1d95a78cdb9aab8d1d724e187f1ba1.tar.zst nixpkgs-fb2e311d1e1d95a78cdb9aab8d1d724e187f1ba1.zip | |
root5: Fix build with Python 3.11
Was broken since the Python update from https://github.com/NixOS/nixpkgs/pull/251878 This should fix the apfelgrid and applgrid builds, not tested yet
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/misc/root/5.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/root/root5-python311-fix.patch | 17 |
2 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 4a8411cd34f..2d830e3d101 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -64,6 +64,9 @@ stdenv.mkDerivation rec { url = "https://github.com/root-project/root/commit/c75458024082de0cc35b45505c652b8460a9e71b.patch"; sha256 = "sha256-A5zEjQE9OGPFp/L1HUs4NIdxQMRiwbwCRNWOLN2ENrM="; }) + # Backport Python 3.11 fix to v5 from v6.26 + # https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc + ./root5-python311-fix.patch ]; # https://github.com/root-project/root/issues/13216 diff --git a/pkgs/applications/science/misc/root/root5-python311-fix.patch b/pkgs/applications/science/misc/root/root5-python311-fix.patch new file mode 100644 index 00000000000..3005b3a73f9 --- /dev/null +++ b/pkgs/applications/science/misc/root/root5-python311-fix.patch @@ -0,0 +1,17 @@ +diff --git a/bindings/pyroot/src/MethodProxy.cxx b/bindings/pyroot/src/MethodProxy.cxx +--- a/bindings/pyroot/src/MethodProxy.cxx ++++ b/bindings/pyroot/src/MethodProxy.cxx +@@ -4,10 +4,10 @@ + // Bindings + #include "PyROOT.h" + #include "structmember.h" // from Python +-#if PY_VERSION_HEX >= 0x02050000 +-#include "code.h" // from Python +-#else ++#if PY_VERSION_HEX < 0x02050000 + #include "compile.h" // from Python ++#elif PY_VERSION_HEX < 0x030b0000 ++#include "code.h" // from Python + #endif + #ifndef CO_NOFREE + // python2.2 does not have CO_NOFREE defined |