From b5e9c49dd1ca3dcedbe828ca3656116878101e84 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 10 Jul 2024 22:50:33 -0300 Subject: [PATCH] godot3-mono: use python311 in scons The build scripts use distutils, which was removed in Python 3.12: File "/build/source/modules/mono/build_scripts/mono_configure.py", line 479: from distutils.dir_util import copy_tree --- pkgs/development/tools/godot/3/mono/default.nix | 8 +++++++- pkgs/development/tools/godot/3/mono/glue.nix | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/godot/3/mono/default.nix b/pkgs/development/tools/godot/3/mono/default.nix index 199965df0cfd..96130cb92abf 100644 --- a/pkgs/development/tools/godot/3/mono/default.nix +++ b/pkgs/development/tools/godot/3/mono/default.nix @@ -5,9 +5,15 @@ , mono , dotnet-sdk , writeText +, scons +, python311 }: -godot3.overrideAttrs (self: base: { +(godot3.override { + scons = scons.override { + python3 = python311; + }; +}).overrideAttrs (self: base: { pname = "godot3-mono"; godotBuildDescription = "mono build"; diff --git a/pkgs/development/tools/godot/3/mono/glue.nix b/pkgs/development/tools/godot/3/mono/glue.nix index bbd046b4af0f..e914bd04e55f 100644 --- a/pkgs/development/tools/godot/3/mono/glue.nix +++ b/pkgs/development/tools/godot/3/mono/glue.nix @@ -1,6 +1,10 @@ -{ godot3, mono }: +{ godot3, mono, scons, python311 }: -godot3.overrideAttrs (self: base: { +(godot3.override { + scons = scons.override { + python3 = python311; + }; +}).overrideAttrs (self: base: { pname = "godot3-mono-glue"; godotBuildDescription = "mono glue"; godotBuildPlatform = "server";