summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2021-11-29 20:28:24 +0100
committerVladimír Čunát <v@cunat.cz>2021-11-29 20:28:24 +0100
commit5f9344617302428c60892090adc986ed4777b598 (patch)
treeeb4cd00462c9af2cd7090c3fa6711e8d503b640c /pkgs/servers
parent9bd3cf0063b80428bd85a286205adab4b6ffcbd6 (diff)
parent0c0f340c22b504ceba6e646c68b9abae5e716eca (diff)
downloadnixpkgs-5f9344617302428c60892090adc986ed4777b598.tar
nixpkgs-5f9344617302428c60892090adc986ed4777b598.tar.gz
nixpkgs-5f9344617302428c60892090adc986ed4777b598.tar.bz2
nixpkgs-5f9344617302428c60892090adc986ed4777b598.tar.lz
nixpkgs-5f9344617302428c60892090adc986ed4777b598.tar.xz
nixpkgs-5f9344617302428c60892090adc986ed4777b598.tar.zst
nixpkgs-5f9344617302428c60892090adc986ed4777b598.zip
Merge #147276: xorg.xf86videomach64: drop the ancient driver
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/x11/xorg/default.nix15
-rw-r--r--pkgs/servers/x11/xorg/tarballs.list1
2 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 47d2985a025..085048ae68d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2275,21 +2275,6 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   # 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";
     version = "2.0.0";
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index cc41317bf0f..75503b3a739 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