xf86-input-evdev: refactor, move to pkgs/by-name & rename from xorg.xf86inputevdev
relevant changes: - switch to GitLab source instead of release tarball - remove the preBuild because it didn't do anything
This commit is contained in:
@@ -0,0 +1,71 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
util-macros,
|
||||
xorgproto,
|
||||
libevdev,
|
||||
udev,
|
||||
mtdev,
|
||||
xorg-server,
|
||||
nix-update-script,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xf86-input-evdev";
|
||||
version = "2.11.0";
|
||||
|
||||
# to get rid of xorgserver.dev; man is tiny
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "driver";
|
||||
repo = "xf86-input-evdev";
|
||||
tag = "xf86-input-evdev-${finalAttrs.version}";
|
||||
hash = "sha256-tXB50laCJcLoBbwM/hE+qEiHzmN7Q+r8uu6NPlRmpTM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
util-macros
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
xorgproto
|
||||
libevdev
|
||||
udev
|
||||
mtdev
|
||||
xorg-server
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-sdkdir=${placeholder "dev"}/include/xorg"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-evdev-(.*)" ]; };
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Generic Linux input driver for the Xorg X server";
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev";
|
||||
license = with lib.licenses; [
|
||||
hpndSellVariant
|
||||
mit
|
||||
];
|
||||
maintainers = [ ];
|
||||
pkgConfigModules = [ "xorg-evdev" ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -128,6 +128,7 @@
|
||||
xdriinfo,
|
||||
xev,
|
||||
xeyes,
|
||||
xf86-input-evdev,
|
||||
xf86-input-mouse,
|
||||
xf86-input-synaptics,
|
||||
xf86-input-vmmouse,
|
||||
@@ -346,6 +347,7 @@ self: with self; {
|
||||
xcbutilrenderutil = libxcb-render-util;
|
||||
xcbutilwm = libxcb-wm;
|
||||
xcursorthemes = xcursor-themes;
|
||||
xf86inputevdev = xf86-input-evdev;
|
||||
xf86inputmouse = xf86-input-mouse;
|
||||
xf86inputsynaptics = xf86-input-synaptics;
|
||||
xf86inputvmmouse = xf86-input-vmmouse;
|
||||
@@ -356,48 +358,6 @@ self: with self; {
|
||||
xorgserver = xorg-server;
|
||||
xorgsgmldoctools = xorg-sgml-doctools;
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xf86inputevdev = callPackage (
|
||||
{
|
||||
stdenv,
|
||||
pkg-config,
|
||||
fetchurl,
|
||||
xorgproto,
|
||||
libevdev,
|
||||
udev,
|
||||
mtdev,
|
||||
xorgserver,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xf86-input-evdev";
|
||||
version = "2.11.0";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz";
|
||||
sha256 = "058k0xdf4hkn8lz5gx4c08mgbzvv58haz7a32axndhscjgg2403k";
|
||||
};
|
||||
hardeningDisable = [
|
||||
"bindnow"
|
||||
"relro"
|
||||
];
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
xorgproto
|
||||
libevdev
|
||||
udev
|
||||
mtdev
|
||||
xorgserver
|
||||
];
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
meta = {
|
||||
pkgConfigModules = [ "xorg-evdev" ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
) { };
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xf86inputjoystick = callPackage (
|
||||
{
|
||||
|
||||
@@ -460,6 +460,7 @@ print OUT <<EOF;
|
||||
xdriinfo,
|
||||
xev,
|
||||
xeyes,
|
||||
xf86-input-evdev,
|
||||
xf86-input-mouse,
|
||||
xf86-input-synaptics,
|
||||
xf86-input-vmmouse,
|
||||
@@ -678,6 +679,7 @@ self: with self; {
|
||||
xcbutilrenderutil = libxcb-render-util;
|
||||
xcbutilwm = libxcb-wm;
|
||||
xcursorthemes = xcursor-themes;
|
||||
xf86inputevdev = xf86-input-evdev;
|
||||
xf86inputmouse = xf86-input-mouse;
|
||||
xf86inputsynaptics = xf86-input-synaptics;
|
||||
xf86inputvmmouse = xf86-input-vmmouse;
|
||||
|
||||
@@ -71,17 +71,6 @@ self: super:
|
||||
{
|
||||
mkfontdir = xorg.mkfontscale;
|
||||
|
||||
xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
]; # to get rid of xorgserver.dev; man is tiny
|
||||
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
|
||||
configureFlags = [
|
||||
"--with-sdkdir=${placeholder "dev"}/include/xorg"
|
||||
];
|
||||
});
|
||||
|
||||
xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: {
|
||||
configureFlags = [
|
||||
"--with-sdkdir=${placeholder "out"}/include/xorg"
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user