From d62a48f5225b6328c96ce61fefb0191e641ebb29 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 24 Nov 2021 13:45:39 +0100 Subject: xorg.xf86videomach64: drop the ancient driver It doesn't seems worth keeping it alive. Broken by commit 0649fcdf2. (I hope I did this right without regenerating.) (cherry picked from commit 0c0f340c22b504ceba6e646c68b9abae5e716eca) --- pkgs/servers/x11/xorg/default.nix | 15 --------------- pkgs/servers/x11/xorg/tarballs.list | 1 - 2 files changed, 16 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 47d2985a0258c..085048ae68dc9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2274,21 +2274,6 @@ lib.makeScope newScope (self: with self; { meta.platforms = lib.platforms.unix; }) {}; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videomach64 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - pname = "xf86-video-mach64"; - version = "6.9.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2"; - sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; - # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-mga"; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index cc41317bf0f86..75503b3a73951 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -101,7 +101,6 @@ mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 -- cgit 1.4.1