Commit be4adf56 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada
Browse files

xorg.xf86videosunleo: 1.2.2 -> 1.2.3 

Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo/-/merge_requests/2
parent 46f6c447

pkgs/servers/x11/xorg/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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;

pkgs/servers/x11/xorg/overrides.nix

+0 −18
Original line number Diff line number Diff line
@@ -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 <<EOF

      diff --git a/src/leo.h b/src/leo.h

      index a5bf41d34955d81b7ea14d4da6bc7f65191a3f98..c45c59b71be679333216d289d689a3c06c8dcbf7 100644

      --- a/src/leo.h

      +++ b/src/leo.h

      @@ -26,7 +26,7 @@



       #include "xf86.h"

       #include "xf86_OSproc.h"

      -#include "xf86RamDac.h"

      +#include "xf86Cursor.h"

       #include <X11/Xmd.h>

       #include "gcstruct.h"

       #include "leo_regs.h"

       EOF

    '';

  });



  xf86videotrident = super.xf86videotrident.overrideAttrs (attrs: {

pkgs/servers/x11/xorg/tarballs.list

+1 −1
Original line number Diff line number Diff line
@@ -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