From 63f2d160a6ad12d8088e4b70140d83d720505326 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 16 Dec 2024 15:20:48 +0100
Subject: [PATCH] pkgs/xorg: remove xf86-video-intel

---
 pkgs/servers/x11/xorg/overrides.nix           | 24 +++-------------
 .../x11/xorg/use_crocus_and_iris.patch        | 28 -------------------
 2 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/servers/x11/xorg/use_crocus_and_iris.patch

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 94158aa99fcd..69f8f2ac8801 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1020,26 +1020,10 @@ self: super:
     meta = attrs.meta // { mainProgram = "xinit"; };
   });
 
-  xf86videointel = super.xf86videointel.overrideAttrs (attrs: {
-    # the update script only works with released tarballs :-/
-    name = "xf86-video-intel-2021-01-15";
-    src = fetchFromGitLab {
-      domain = "gitlab.freedesktop.org";
-      group = "xorg";
-      owner = "driver";
-      repo = "xf86-video-intel";
-      rev = "31486f40f8e8f8923ca0799aea84b58799754564";
-      sha256 = "sha256-nqT9VZDb2kAC72ot9UCdwEkM1uuP9NriJePulzrdZlM=";
-    };
-    buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXv xorg.pixman xorg.utilmacros ];
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ];
-    configureFlags = [ "--with-default-dri=3" "--enable-tools" ];
-    patches = [ ./use_crocus_and_iris.patch ];
-
-    meta = attrs.meta // {
-      platforms = ["i686-linux" "x86_64-linux"];
-    };
-  });
+  xf86videointel = throw ''
+    xf86videointel has been removed as the package is unmaintained and the driver is no longer functional.
+    Please remove "intel" from `services.xserver.videoDrivers` and switch to the "modesetting" driver.
+  ''; # Added 2024-12-16;
 
   xf86videoopenchrome = super.xf86videoopenchrome.overrideAttrs (attrs: {
     buildInputs = attrs.buildInputs ++ [ xorg.libXv ];
diff --git a/pkgs/servers/x11/xorg/use_crocus_and_iris.patch b/pkgs/servers/x11/xorg/use_crocus_and_iris.patch
deleted file mode 100644
index 54744f463bd9..000000000000
--- a/pkgs/servers/x11/xorg/use_crocus_and_iris.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/uxa/intel_dri.c
-+++ b/src/uxa/intel_dri.c
-@@ -1540,8 +1540,10 @@
- 			return has_i830_dri() ? "i830" : "i915";
- 		else if (INTEL_INFO(intel)->gen < 040)
- 			return "i915";
-+		else if (INTEL_INFO(intel)->gen < 0100)
-+			return "crocus";
- 		else
--			return "i965";
-+			return "iris";
- 	}
- 
- 	return s;
---- a/src/sna/sna_dri2.c
-+++ b/src/sna/sna_dri2.c
-@@ -3707,8 +3707,10 @@
- 			return has_i830_dri() ? "i830" : "i915";
- 		else if (sna->kgem.gen < 040)
- 			return "i915";
-+		else if (sna->kgem.gen < 0100)
-+			return "crocus";
- 		else
--			return "i965";
-+			return "iris";
- 	}
- 
- 	return s;