Commit 9e88cf2c authored by Thiago Kenji Okada's avatar Thiago Kenji Okada
Browse files

xorg.xf86videosuncg6: 1.1.2 -> 1.1.3 

Release notes:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6/-/merge_requests/2
parent 0ca7d99e

pkgs/servers/x11/xorg/default.nix

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

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

    pname = "xf86-video-suncg6";

    version = "1.1.2";

    version = "1.1.3";

    builder = ./builder.sh;

    src = fetchurl {

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

      sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr";

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

      sha256 = "16c3g5m0f5y9nx2x6w9jdzbs9yr6xhq31j37dcffxbsskmfxq57w";

    };

    hardeningDisable = [ "bindnow" "relro" ];

    strictDeps = true;

pkgs/servers/x11/xorg/overrides.nix

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


  xf86videosuncg6 = super.xf86videosuncg6.overrideAttrs (attrs: {

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

    # https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6/-/commit/14392504de04841fa2cbb5cdf8d9c9c7c4eb2ed8

    postPatch = ''

      patch -p1 <<EOF

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

      index 9f176e69dc1f6fc5e35ca20c30a4d3b4faf52623..d6bc19e8767c6aee9e7174a43cf1d71a9f35af32 100644

      --- a/src/cg6.h

      +++ b/src/cg6.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 "cg6_regs.h"

       EOF

    '';

  });



  xf86videosunffb = super.xf86videosunffb.overrideAttrs (attrs: {

pkgs/servers/x11/xorg/tarballs.list

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 
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.2.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-sunleo-1.2.2.tar.bz2

mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2