Unverified Commit a5402171 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

xf86-video-{vbox,vesa}: refactor, move to pkgs/by-name & rename from xorg namespace (#478638)

parents 51903798 afd4dcf8

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

0 → 100644
+63 −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-vbox";

  version = "1.0.1";



  src = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    group = "xorg";

    owner = "driver";

    repo = "xf86-video-vbox";

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

    hash = "sha256-C+5spc9EABu3p5Ck7R4bWedLDm8h0DrbYic2AwIUAqU=";

  };



  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-vboxvideo-(.*)" ]; };

  };



  meta = {

    description = "VirtualBox video driver for the Xorg X server";

    longDescription = ''

      This driver is only for use in VirtualBox guests without the vboxvideo kernel modesetting

      driver in the guest kernel, and which are configured to use the VBoxVGA device instead of a

      VMWare-compatible video device emulation.

      Guests with the vboxvideo kernel modesetting driver should use the Xorg "modesetting" driver

      module instead of this one.

    '';

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

    license = with lib.licenses; [

      mit

      x11

    ];

    maintainers = [ ];

    platforms = lib.platforms.unix;

    broken = stdenv.hostPlatform.isAarch64;

  };

})

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

0 → 100644
+53 −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-vesa";

  version = "2.6.0";



  src = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    group = "xorg";

    owner = "driver";

    repo = "xf86-video-vesa";

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

    hash = "sha256-M8/mSgD398wBswOp0oEXvlcgVsYdWcTIw3ah5e1uHV8=";

  };



  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-vesa-(.*)" ]; };

  };



  meta = {

    description = "Generic VESA video driver for the Xorg X server";

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

    license = lib.licenses.x11;

    maintainers = [ ];

    platforms = lib.platforms.unix;

    broken = stdenv.hostPlatform.isAarch64;

  };

})

pkgs/servers/x11/xorg/default.nix

+4 −76
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ 
  xf86-video-sunleo,

  xf86-video-tdfx,

  xf86-video-v4l,

  xf86-video-vbox,

  xf86-video-vesa,

  xfd,

  xfontsel,

  xfs,
@@ -386,6 +388,8 @@ self: with self; { 
  xf86videosunleo = xf86-video-sunleo;

  xf86videotdfx = xf86-video-tdfx;

  xf86videov4l = xf86-video-v4l;

  xf86videovboxvideo = xf86-video-vbox;

  xf86videovesa = xf86-video-vesa;

  xkeyboardconfig = xkeyboard-config;

  xorgcffiles = xorg-cf-files;

  xorgdocs = xorg-docs;
@@ -1012,82 +1016,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videovboxvideo = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgproto,

      libpciaccess,

      xorgserver,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xf86-video-vboxvideo";

      version = "1.0.1";

      builder = ./builder.sh;

      src = fetchurl {

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

        sha256 = "12kzgf516mbdygpni0jzm3dv60vz6vf704f3hgc6pi9bgpy6bz4f";

      };

      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!

  xf86videovesa = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgproto,

      libpciaccess,

      xorgserver,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xf86-video-vesa";

      version = "2.6.0";

      builder = ./builder.sh;

      src = fetchurl {

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

        sha256 = "1ccvaigb1f1kz8nxxjmkfn598nabd92p16rx1g35kxm8n5qjf20h";

      };

      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!

  xf86videovmware = callPackage (

    {

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

+4 −0
Original line number Diff line number Diff line
@@ -486,6 +486,8 @@ print OUT <<EOF; 
  xf86-video-sunleo,

  xf86-video-tdfx,

  xf86-video-v4l,

  xf86-video-vbox,

  xf86-video-vesa,

  xfd,

  xfontsel,

  xfs,
@@ -718,6 +720,8 @@ self: with self; { 
  xf86videosunleo = xf86-video-sunleo;

  xf86videotdfx = xf86-video-tdfx;

  xf86videov4l = xf86-video-v4l;

  xf86videovboxvideo = xf86-video-vbox;

  xf86videovesa = xf86-video-vesa;

  xkeyboardconfig = xkeyboard-config;

  xorgcffiles = xorg-cf-files;

  xorgdocs = xorg-docs;

pkgs/servers/x11/xorg/tarballs.list

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 
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-trident-1.4.0.tar.xz

mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.1.tar.xz

mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz

mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz

mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz

mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2