diff options
| author | Artturi <Artturin@artturin.com> | 2021-11-29 22:25:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-29 22:25:18 +0200 |
| commit | c7addf512b1170ecc8d9f9111e5b480cfd68dd5c (patch) | |
| tree | 90006a21fe093c9a858b989ec89c9c9061b94b3b | |
| parent | ed30ac8c5d7b983d2dd592f2bb6bc81f6a39b200 (diff) | |
| parent | d62a48f5225b6328c96ce61fefb0191e641ebb29 (diff) | |
Merge pull request #147926 from NixOS/backport-147276-to-release-21.11
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 1 |
2 files changed, 0 insertions, 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 @@ -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 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 |