Unverified Commit 580c18b2 authored by quantenzitrone's avatar quantenzitrone
Browse files

xf86-video-s3virge: refactor, move to pkgs/by-name & rename from xorg.xf86videos3virge 

relevant changes:
- switch to GitLab source instead of release tarball
parent b565132d

pkgs/by-name/xf/xf86-video-s3virge/package.nix

0 → 100644
+57 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitLab,

  autoreconfHook,

  pkg-config,

  util-macros,

  xorg-server,

  xorgproto,

  libpciaccess,

  nix-update-script,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "xf86-video-s3virge";

  version = "1.11.1";



  src = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    group = "xorg";

    owner = "driver";

    repo = "xf86-video-s3virge";

    tag = "xf86-video-s3virge-${finalAttrs.version}";

    hash = "sha256-UxAzsevKIMA3p6Q5cKjRPOku4cfbXiLmcJQWNEjpu7s=";

  };



  strictDeps = true;



  nativeBuildInputs = [

    autoreconfHook

    pkg-config

    util-macros

    xorg-server # for some autoconf macros

  ];



  buildInputs = [

    xorg-server

    xorgproto

    libpciaccess

  ];



  passthru = {

    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-s3virge-(.*)" ]; };

  };



  meta = {

    description = "S3 ViRGE video driver for the Xorg X server";

    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-s3virge";

    license = with lib.licenses; [

      x11

      free # unknown free license TODO add to spdx

      mit

    ];

    maintainers = [ ];

    platforms = lib.platforms.unix;

    badPlatforms = lib.platforms.aarch64;

  };

})

pkgs/servers/x11/xorg/default.nix

+2 −38
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
  xf86-video-ark,

  xf86-video-geode,

  xf86-video-nouveau,

  xf86-video-s3virge,

  xfd,

  xfontsel,

  xfs,
@@ -348,6 +349,7 @@ self: with self; { 
  xf86videoark = xf86-video-ark;

  xf86videogeode = xf86-video-geode;

  xf86videonouveau = xf86-video-nouveau;

  xf86videos3virge = xf86-video-s3virge;

  xkeyboardconfig = xkeyboard-config;

  xorgcffiles = xorg-cf-files;

  xorgdocs = xorg-docs;
@@ -1292,44 +1294,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videos3virge = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgproto,

      libpciaccess,

      xorgserver,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xf86-video-s3virge";

      version = "1.11.1";

      builder = ./builder.sh;

      src = fetchurl {

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

        sha256 = "1qzfcq3rlpfdb6qxz8hrp9py1q11vyzl4iqxip1vpgfnfn83vl6f";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [

        xorgproto

        libpciaccess

        xorgserver

      ];

      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

      meta = {

        pkgConfigModules = [ ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videosavage = callPackage (

    {

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

+2 −0
Original line number Diff line number Diff line
@@ -467,6 +467,7 @@ print OUT <<EOF; 
  xf86-video-ark,

  xf86-video-geode,

  xf86-video-nouveau,

  xf86-video-s3virge,

  xfd,

  xfontsel,

  xfs,
@@ -680,6 +681,7 @@ self: with self; { 
  xf86videoark = xf86-video-ark;

  xf86videogeode = xf86-video-geode;

  xf86videonouveau = xf86-video-nouveau;

  xf86videos3virge = xf86-video-s3virge;

  xkeyboardconfig = xkeyboard-config;

  xorgcffiles = xorg-cf-files;

  xorgdocs = xorg-docs;

pkgs/servers/x11/xorg/overrides.nix

+0 −6
Original line number Diff line number Diff line
@@ -126,12 +126,6 @@ self: super: 
    };

  });



  xf86videos3virge = super.xf86videos3virge.overrideAttrs (attrs: {

    meta = attrs.meta // {

      badPlatforms = lib.platforms.aarch64;

    };

  });



  xf86videov4l = super.xf86videov4l.overrideAttrs (attrs: {

    meta = attrs.meta // {

      platforms = lib.platforms.linux;

pkgs/servers/x11/xorg/tarballs.list

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2 
mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2

mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz

mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz

mirror://xorg/individual/driver/xf86-video-s3virge-1.11.1.tar.xz

mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz

mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz

mirror://xorg/individual/driver/xf86-video-sis-0.12.0.tar.gz