xf86-input-libinput: refactor, move to pkgs/by-name & rename from xorg.xf86inputlibinput
relevant changes: - switch to GitLab source instead of release tarball
This commit is contained in:
@@ -0,0 +1,67 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
util-macros,
|
||||
xorgproto,
|
||||
libinput,
|
||||
xorg-server,
|
||||
nix-update-script,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xf86-input-libinput";
|
||||
version = "1.5.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "driver";
|
||||
repo = "xf86-input-libinput";
|
||||
tag = "xf86-input-libinput-${finalAttrs.version}";
|
||||
hash = "sha256-yZi5h3k6cwunucLhmH/wNchA0M11U3KBwrRuY/oATh8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
util-macros
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
xorgproto
|
||||
libinput
|
||||
xorg-server
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-sdkdir=${placeholder "dev"}/include/xorg"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-libinput-(.*)" ]; };
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "libinput-based input driver for the Xorg X server";
|
||||
longDescription = ''
|
||||
This is an X driver based on libinput. It is a thin wrapper around libinput, so while it does
|
||||
provide all features that libinput supports it does little beyond.
|
||||
'';
|
||||
homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
pkgConfigModules = [ "xorg-libinput" ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -131,6 +131,7 @@
|
||||
xf86-input-evdev,
|
||||
xf86-input-joystick,
|
||||
xf86-input-keyboard,
|
||||
xf86-input-libinput,
|
||||
xf86-input-mouse,
|
||||
xf86-input-synaptics,
|
||||
xf86-input-vmmouse,
|
||||
@@ -352,6 +353,7 @@ self: with self; {
|
||||
xf86inputevdev = xf86-input-evdev;
|
||||
xf86inputjoystick = xf86-input-joystick;
|
||||
xf86inputkeyboard = xf86-input-keyboard;
|
||||
xf86inputlibinput = xf86-input-libinput;
|
||||
xf86inputmouse = xf86-input-mouse;
|
||||
xf86inputsynaptics = xf86-input-synaptics;
|
||||
xf86inputvmmouse = xf86-input-vmmouse;
|
||||
@@ -362,44 +364,6 @@ self: with self; {
|
||||
xorgserver = xorg-server;
|
||||
xorgsgmldoctools = xorg-sgml-doctools;
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xf86inputlibinput = callPackage (
|
||||
{
|
||||
stdenv,
|
||||
pkg-config,
|
||||
fetchurl,
|
||||
xorgproto,
|
||||
libinput,
|
||||
xorgserver,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xf86-input-libinput";
|
||||
version = "1.5.0";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz";
|
||||
sha256 = "1rl06l0gdqmc4v08mya93m74ana76b7s3fzkmq8ylm3535gw6915";
|
||||
};
|
||||
hardeningDisable = [
|
||||
"bindnow"
|
||||
"relro"
|
||||
];
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
xorgproto
|
||||
libinput
|
||||
xorgserver
|
||||
];
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
meta = {
|
||||
pkgConfigModules = [ "xorg-libinput" ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
) { };
|
||||
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xf86videoamdgpu = callPackage (
|
||||
{
|
||||
|
||||
@@ -463,6 +463,7 @@ print OUT <<EOF;
|
||||
xf86-input-evdev,
|
||||
xf86-input-joystick,
|
||||
xf86-input-keyboard,
|
||||
xf86-input-libinput,
|
||||
xf86-input-mouse,
|
||||
xf86-input-synaptics,
|
||||
xf86-input-vmmouse,
|
||||
@@ -684,6 +685,7 @@ self: with self; {
|
||||
xf86inputevdev = xf86-input-evdev;
|
||||
xf86inputjoystick = xf86-input-joystick;
|
||||
xf86inputkeyboard = xf86-input-keyboard;
|
||||
xf86inputlibinput = xf86-input-libinput;
|
||||
xf86inputmouse = xf86-input-mouse;
|
||||
xf86inputsynaptics = xf86-input-synaptics;
|
||||
xf86inputvmmouse = xf86-input-vmmouse;
|
||||
|
||||
@@ -71,16 +71,6 @@ self: super:
|
||||
{
|
||||
mkfontdir = xorg.mkfontscale;
|
||||
|
||||
xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: {
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
configureFlags = [
|
||||
"--with-sdkdir=${placeholder "dev"}/include/xorg"
|
||||
];
|
||||
});
|
||||
|
||||
xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin
|
||||
|
||||
xf86videoark = super.xf86videoark.overrideAttrs (attrs: {
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.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