diff options
| author | TredwellGit <tredwell@tutanota.com> | 2022-01-08 09:25:23 +0000 |
|---|---|---|
| committer | TredwellGit <tredwell@tutanota.com> | 2022-01-09 01:52:23 +0000 |
| commit | 6a9fc4441581e787ce8aec724a100a17817133a2 (patch) | |
| tree | e9ec207a4a4340821d5f1119b461ad7c3ce03ed9 /pkgs/servers/x11 | |
| parent | d334cee58242aaa7a01c1ebaafc54e8fecdbf9c1 (diff) | |
| download | nixpkgs-6a9fc4441581e787ce8aec724a100a17817133a2.tar nixpkgs-6a9fc4441581e787ce8aec724a100a17817133a2.tar.gz nixpkgs-6a9fc4441581e787ce8aec724a100a17817133a2.tar.bz2 nixpkgs-6a9fc4441581e787ce8aec724a100a17817133a2.tar.lz nixpkgs-6a9fc4441581e787ce8aec724a100a17817133a2.tar.xz nixpkgs-6a9fc4441581e787ce8aec724a100a17817133a2.tar.zst nixpkgs-6a9fc4441581e787ce8aec724a100a17817133a2.zip | |
xorg.xf86videoati: 19.1.0 -> 5eba006e4129e8015b822f9e1d2f1e613e252cda
Using the latest commit because abandoned upstream, but required for X server 21.1.
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 7 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 932372d2b3d..bc957480139 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2127,11 +2127,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-ati"; - version = "19.1.0"; + version = "5eba006e4129e8015b822f9e1d2f1e613e252cda"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-ati-19.1.0.tar.bz2"; - sha256 = "0j9w4axsqlycv4v14g53xyhkm9h7d27b2fcv9lrzb9gf54b5m7v5"; + url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/archive/5eba006e4129e8015b822f9e1d2f1e613e252cda/xf86-video-ati-5eba006e4129e8015b822f9e1d2f1e613e252cda.tar.bz2"; + sha256 = "0gmymk8207fd9rjliq05l2gvx220h432rj3h75hv2ylr3k9vmp2b"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 27a4da9622b..def96d47a63 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -442,6 +442,13 @@ self: super: xf86videoati = super.xf86videoati.overrideAttrs (attrs: { NIX_CFLAGS_COMPILE = "-I${self.xorgserver.dev or self.xorgserver}/include/xorg"; + nativeBuildInputs = with self; attrs.nativeBuildInputs ++ [ autoreconfHook utilmacros ]; + patches = [ + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/e0511968d04b42abf11bc0ffb387f143582bc144.patch"; + sha256 = "sha256-79nqKuJRgMYXDEMB8IWxdmbxtI/m+Oca1wSLYeGMuEk="; + }) + ]; }); xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 96a5ac712f4..0ecb0e474cb 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -90,7 +90,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-21.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-19.1.0.tar.bz2 +https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/archive/5eba006e4129e8015b822f9e1d2f1e613e252cda/xf86-video-ati-5eba006e4129e8015b822f9e1d2f1e613e252cda.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 |