Commit 46f6c447 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada
Browse files

xorg.xf86videosunffb: 1.2.2 -> 1.2.3 

Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb/-/merge_requests/2
parent 9e88cf2c

pkgs/servers/x11/xorg/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2716,11 +2716,11 @@ self: with self; { 
  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videosunffb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation {

    pname = "xf86-video-sunffb";

    version = "1.2.2";

    version = "1.2.3";

    builder = ./builder.sh;

    src = fetchurl {

      url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2";

      sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s";

      url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz";

      sha256 = "0pf4ddh09ww7sxpzs5gr9pxh3gdwkg3f54067cp802nkw1n8vypi";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    strictDeps = true;

pkgs/servers/x11/xorg/overrides.nix

+0 −18
Original line number Diff line number Diff line
@@ -494,24 +494,6 @@ self: super: 


  xf86videosunffb = super.xf86videosunffb.overrideAttrs (attrs: {

    meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin

    # https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb/-/commit/656dd83b489e7bdc72d6c1990025d20dea26dc22

    postPatch = ''

      patch -p1 <<EOF

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

      index 67a2d87afa607b6bea07e53f4be738c1ebb757ab..d87024033fb48a83c50c588866c90cd6eac0975c 100644

      --- a/src/ffb.h

      +++ b/src/ffb.h

      @@ -30,7 +30,7 @@



       #include "xf86.h"

       #include "xf86_OSproc.h"

      -#include "xf86RamDac.h"

      +#include "xf86Cursor.h"

       #ifdef HAVE_XAA_H

       #include "xaa.h"

       #endif

       EOF

    '';

  });



  xf86videosunleo = super.xf86videosunleo.overrideAttrs (attrs: {

pkgs/servers/x11/xorg/tarballs.list

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 
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.2.tar.bz2

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-tdfx-1.5.0.tar.bz2

mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2