From 6040cf7833fe89e9dbe6a695e2636e3dcd1a756b Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 13 Dec 2025 01:03:17 +0100 Subject: [PATCH] xf86videoglint: remove broken video driver --- pkgs/servers/x11/xorg/default.nix | 38 ----------------------------- pkgs/servers/x11/xorg/overrides.nix | 13 +++------- pkgs/servers/x11/xorg/tarballs.list | 1 - 3 files changed, 4 insertions(+), 48 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ad4147934a51..2ac9b6ac33ef 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1222,44 +1222,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoglint = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libpciaccess, - xorgproto, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-glint"; - version = "1.2.9"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2"; - sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libpciaccess - xorgproto - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoi128 = callPackage ( { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c4a45f5f28b6..3298c229bcba 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -286,15 +286,6 @@ self: super: NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; }); - xf86videoglint = super.xf86videoglint.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; - buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; - # https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1 - meta = attrs.meta // { - broken = true; - }; - }); - xf86videosuncg6 = super.xf86videosuncg6.overrideAttrs (attrs: { meta = attrs.meta // { broken = isDarwin; @@ -750,4 +741,8 @@ self: super: // lib.optionalAttrs config.allowAliases { fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24 xf86videoglide = throw "The Xorg Glide video driver has been archived upstream due to being obsolete"; # added 2025-12-13 + xf86videoglint = throw '' + The Xorg GLINT/Permedia video driver has been broken since xorg 21. + see https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1 + ''; # added 2025-12-13 } diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index ee3bbbf52e01..8ed1cbef0fa3 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -31,7 +31,6 @@ mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz mirror://xorg/individual/driver/xf86-video-geode-2.18.1.tar.xz -mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2