diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d77c63ff63be..9b336a4447e8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2732,11 +2732,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosunleo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-sunleo"; - version = "1.2.2"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2"; - sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; + url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz"; + sha256 = "1px670aiqyzddl1nz3xx1lmri39irajrqw6dskirs2a64jgp3dpc"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 44af4d18145e..b64adcc1fe30 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -498,24 +498,6 @@ self: super: xf86videosunleo = super.xf86videosunleo.overrideAttrs (attrs: { meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin - # https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo/-/commit/f58ba53e6b6fe1b6e21d6aa3901a11e6130b95b0 - postPatch = '' - patch -p1 < - #include "gcstruct.h" - #include "leo_regs.h" - EOF - ''; }); xf86videotrident = super.xf86videotrident.overrideAttrs (attrs: { diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 1aa58d7ad5bd..72ae0963f8e8 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -118,7 +118,7 @@ mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz -mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2