From 646d8a4577477acd8f07db6d93bde17129f1507c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 8 Jul 2024 21:07:05 +0200
Subject: [PATCH] python311Packages.mayavi: unbreak, set mainProgram

All removed patches have been merged and tagged in this release.
Docs are no longer built by default as of 4.8.0
---
 .../python-modules/mayavi/default.nix         | 30 +------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix
index b9fa608772b7..32929cfe2353 100644
--- a/pkgs/development/python-modules/mayavi/default.nix
+++ b/pkgs/development/python-modules/mayavi/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   envisage,
   fetchPypi,
-  fetchpatch,
   numpy,
   packaging,
   pyface,
@@ -19,7 +18,6 @@
 
 buildPythonPackage rec {
   pname = "mayavi";
-  # TODO: Remove meta.broken on next release.
   version = "4.8.2";
   format = "setuptools";
 
@@ -30,30 +28,6 @@ buildPythonPackage rec {
     hash = "sha256-sQ/pFF8hxI5JAvDnRrNgOzy2lNEUVlFaRoIPIaCnQik=";
   };
 
-  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 \
-      --replace "build.build.run(self)" "build.build.run(self); return"
-  '';
-
   nativeBuildInputs = [ wrapQtAppsHook ];
 
   propagatedBuildInputs = [
@@ -84,8 +58,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/enthought/mayavi";
     license = licenses.bsdOriginal;
     maintainers = with maintainers; [ knedlsepp ];
-    # Should be fixed in a version from after March 26, see:
-    # https://github.com/enthought/mayavi/issues/1284#issuecomment-2020631244
-    broken = pythonAtLeast "3.12";
+    mainProgram = "mayavi2";
   };
 }