xf86-input-void: refactor, move to pkgs/by-name & rename from xorg.xf86inputvoid
relevant changes: - switch to GitLab source instead of release tarball
This commit is contained in:
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
util-macros,
|
||||
xorg-server,
|
||||
xorgproto,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xf86-input-void";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "driver";
|
||||
repo = "xf86-input-void";
|
||||
tag = "xf86-input-void-${finalAttrs.version}";
|
||||
hash = "sha256-R2c+FUBJQ9GfMcZ9NKSgT0lfOkqiCKrA+lFVu8l6e10=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
util-macros
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
xorg-server
|
||||
xorgproto
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-void-(.*)" ]; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Null input driver for the Xorg X server";
|
||||
longDescription = ''
|
||||
This is a null input driver for the Xorg X server.
|
||||
It doesn't connect to any physical device, and it never delivers any events.
|
||||
It functions as both a pointer and keyboard device, and may be used as the X server's core
|
||||
pointer and/or core keyboard.
|
||||
'';
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-void";
|
||||
license = with lib.licenses; [
|
||||
hpndSellVariant
|
||||
mit
|
||||
];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin
|
||||
};
|
||||
})
|
||||
@@ -130,6 +130,7 @@
|
||||
xf86-input-mouse,
|
||||
xf86-input-synaptics,
|
||||
xf86-input-vmmouse,
|
||||
xf86-input-void,
|
||||
xfd,
|
||||
xfontsel,
|
||||
xfs,
|
||||
@@ -338,6 +339,7 @@ self: with self; {
|
||||
xf86inputmouse = xf86-input-mouse;
|
||||
xf86inputsynaptics = xf86-input-synaptics;
|
||||
xf86inputvmmouse = xf86-input-vmmouse;
|
||||
xf86inputvoid = xf86-input-void;
|
||||
xkeyboardconfig = xkeyboard-config;
|
||||
xorgcffiles = xorg-cf-files;
|
||||
xorgdocs = xorg-docs;
|
||||
@@ -536,42 +538,6 @@ self: with self; {
|
||||
})
|
||||
) { };
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xf86inputvoid = callPackage (
|
||||
{
|
||||
stdenv,
|
||||
pkg-config,
|
||||
fetchurl,
|
||||
xorgserver,
|
||||
xorgproto,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xf86-input-void";
|
||||
version = "1.4.2";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/driver/xf86-input-void-1.4.2.tar.xz";
|
||||
sha256 = "11bqy2djgb82c1g8ylpfwp3wjw4x83afi8mqyn5fvqp03kidh4d2";
|
||||
};
|
||||
hardeningDisable = [
|
||||
"bindnow"
|
||||
"relro"
|
||||
];
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
xorgserver
|
||||
xorgproto
|
||||
];
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
meta = {
|
||||
pkgConfigModules = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
) { };
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xf86videoamdgpu = callPackage (
|
||||
{
|
||||
|
||||
@@ -462,6 +462,7 @@ print OUT <<EOF;
|
||||
xf86-input-mouse,
|
||||
xf86-input-synaptics,
|
||||
xf86-input-vmmouse,
|
||||
xf86-input-void,
|
||||
xfd,
|
||||
xfontsel,
|
||||
xfs,
|
||||
@@ -670,6 +671,7 @@ self: with self; {
|
||||
xf86inputmouse = xf86-input-mouse;
|
||||
xf86inputsynaptics = xf86-input-synaptics;
|
||||
xf86inputvmmouse = xf86-input-vmmouse;
|
||||
xf86inputvoid = xf86-input-void;
|
||||
xkeyboardconfig = xkeyboard-config;
|
||||
xorgcffiles = xorg-cf-files;
|
||||
xorgdocs = xorg-docs;
|
||||
|
||||
@@ -147,7 +147,6 @@ self: super:
|
||||
];
|
||||
});
|
||||
|
||||
xf86inputvoid = brokenOnDarwin super.xf86inputvoid; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin
|
||||
xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin
|
||||
|
||||
xf86videoark = super.xf86videoark.overrideAttrs (attrs: {
|
||||
|
||||
@@ -7,7 +7,6 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz
|
||||
mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
|
||||
mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
|
||||
mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
|
||||
mirror://xorg/individual/driver/xf86-input-void-1.4.2.tar.xz
|
||||
mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
|
||||
mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-video-ark-0.7.6.tar.xz
|
||||
|
||||
Reference in New Issue
Block a user