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

relevant changes:
- switch to GitLab source instead of release tarball
This commit is contained in:
quantenzitrone
2026-01-10 20:32:00 +01:00
parent b0aad0404c
commit 6f460393b3
5 changed files with 69 additions and 57 deletions
@@ -0,0 +1,65 @@
{
lib,
stdenv,
fetchFromGitLab,
autoreconfHook,
pkg-config,
util-macros,
xorg-server,
xorgproto,
libdrm,
libpciaccess,
libx11,
libxext,
udev,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-vmware";
version = "13.4.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
group = "xorg";
owner = "driver";
repo = "xf86-video-vmware";
tag = "xf86-video-vmware-${finalAttrs.version}";
hash = "sha256-aC/LsAvrVtG+2SrMaB7ROJTUIleZTcLydmt5cQf0dHc=";
};
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
pkg-config
util-macros
xorg-server # for some autoconf macros
];
buildInputs = [
xorg-server
xorgproto
libdrm
libpciaccess
libx11
libxext
udev
];
env.NIX_CFLAGS_COMPILE = "-Wno-error=address"; # gcc12
passthru.updateScript = nix-update-script {
extraArgs = [ "--version-regex=xf86-video-vmware-(.*)" ];
};
meta = {
description = "VMware guest video driver for the Xorg X server";
homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware";
license = with lib.licenses; [
x11
mit
];
maintainers = [ ];
platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86;
};
})
+2 -46
View File
@@ -169,6 +169,7 @@
xf86-video-v4l,
xf86-video-vbox,
xf86-video-vesa,
xf86-video-vmware,
xfd,
xfontsel,
xfs,
@@ -424,6 +425,7 @@ self: with self; {
xf86videov4l = xf86-video-v4l;
xf86videovboxvideo = xf86-video-vbox;
xf86videovesa = xf86-video-vesa;
xf86videovmware = xf86-video-vmware;
xkeyboardconfig = xkeyboard-config;
xorgcffiles = xorg-cf-files;
xorgdocs = xorg-docs;
@@ -478,52 +480,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videovmware = callPackage (
{
stdenv,
pkg-config,
fetchurl,
xorgproto,
libdrm,
udev,
libpciaccess,
libX11,
libXext,
xorgserver,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-vmware";
version = "13.4.0";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz";
sha256 = "06mq7spifsrpbwq9b8kn2cn61xq6mpkq6lvh4qi6xk2yxpjixlxf";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
libdrm
udev
libpciaccess
libX11
libXext
xorgserver
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videovoodoo = callPackage (
{
@@ -501,6 +501,7 @@ print OUT <<EOF;
xf86-video-v4l,
xf86-video-vbox,
xf86-video-vesa,
xf86-video-vmware,
xfd,
xfontsel,
xfs,
@@ -756,6 +757,7 @@ self: with self; {
xf86videov4l = xf86-video-v4l;
xf86videovboxvideo = xf86-video-vbox;
xf86videovesa = xf86-video-vesa;
xf86videovmware = xf86-video-vmware;
xkeyboardconfig = xkeyboard-config;
xorgcffiles = xorg-cf-files;
xorgdocs = xorg-docs;
-10
View File
@@ -59,16 +59,6 @@ self: super:
{
mkfontdir = xorg.mkfontscale;
xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address" ]; # gcc12
meta = attrs.meta // {
platforms = [
"i686-linux"
"x86_64-linux"
];
};
});
# xkeyboardconfig variant extensible with custom layouts.
# See nixos/modules/services/x11/extra-layouts.nix
xkeyboardconfig_custom =
-1
View File
@@ -1,3 +1,2 @@
mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz