diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index f6f5edc84ef8..58cdf9592cdc 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -35,7 +35,9 @@ stdenv.mkDerivation rec { hash = "sha256-SzdWyzdGhsaesv1VX5ZUfUnLHvRvW8buJTlOVxz6yOk="; }; - patches = lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ + ./draco.patch + ] ++ lib.optional stdenv.isDarwin ./darwin.patch; nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev @@ -165,6 +167,7 @@ stdenv.mkDerivation rec { mkdir $out/Applications mv $out/Blender.app $out/Applications '' + '' + mv $out/share/blender/${lib.versions.majorMinor version}/python{,-ext} buildPythonPath "$pythonPath" wrapProgram $blenderExecutable \ --prefix PATH : $program_PATH \ diff --git a/pkgs/applications/misc/blender/draco.patch b/pkgs/applications/misc/blender/draco.patch new file mode 100644 index 000000000000..2a856a0638ae --- /dev/null +++ b/pkgs/applications/misc/blender/draco.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -898,11 +898,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES OFF) + set_and_warn_dependency(WITH_PYTHON WITH_DRACO OFF) + set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID OFF) + +-if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL) +- message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now") +- set(WITH_DRACO OFF) +-endif() +- + # enable boost for cycles, audaspace or i18n + # otherwise if the user disabled + +--- a/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py ++++ b/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py +@@ -17,7 +17,7 @@ def dll_path() -> Path: + """ + lib_name = 'extern_draco' +- blender_root = Path(bpy.app.binary_path).parent ++ blender_root = Path(bpy.app.binary_path).parent.parent +- python_lib = Path('{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version)) ++ python_lib = Path('share/blender/{v[0]}.{v[1]}/python-ext/lib'.format(v=bpy.app.version)) + python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info) + + path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH')