host: Use nixos-hardware
- Remove iptsd. It is packaged upstream
This commit is contained in:
@@ -54,7 +54,6 @@ key-mapper = prev.callPackage ./tools/games/key-mapper {};
|
||||
|
||||
sddm-sugar-dark = prev.callPackage ./sddm-sugar-dark {};
|
||||
|
||||
iptsd = prev.callPackage ./tools/daemons/iptsd {};
|
||||
surface-control = prev.callPackage ./tools/system/surface-control {};
|
||||
|
||||
trackma = prev.callPackage ./tools/video/trackma {};
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
stdenv, lib
|
||||
, fetchFromGitHub
|
||||
, meson, cmake, ninja, pkg-config
|
||||
, inih, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iptsd";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-surface";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0bh7rr37yck82g41dw2xcfkmyp1ncd27n1slb8xlknp7vs9f10qa";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"-Dsample_config=false"
|
||||
"-Ddebug_tool=false"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./meson.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -e "s|@UDEVRULESDIR@|$out/lib/udev/rules.d/|" --in-place meson.build
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ meson cmake ninja pkg-config ];
|
||||
buildInputs = [ inih systemd ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/linux-surface/iptsd";
|
||||
description = "Userspace daemon for Intel Precise Touch & Stylus";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index b74a177..ca41ba3 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -104,18 +104,19 @@ configure_file(
|
||||
service_manager = get_option('service_manager')
|
||||
if service_manager.contains('systemd')
|
||||
systemd = dependency('systemd')
|
||||
- unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
|
||||
+ #unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
|
||||
|
||||
udev = dependency('udev')
|
||||
- udevdir = udev.get_pkgconfig_variable('udevdir')
|
||||
- rulesdir = join_paths(udevdir, 'rules.d')
|
||||
+ #udevdir = udev.get_pkgconfig_variable('udevdir')
|
||||
+ #udevdir = '@UDEVDIR@';
|
||||
+ #rulesdir = join_paths('@UDEVDIR@', 'rules.d')
|
||||
|
||||
- install_data(
|
||||
- join_paths(meson.current_build_dir(), 'iptsd.service'),
|
||||
- install_dir: unitdir
|
||||
- )
|
||||
+########install_data(
|
||||
+######## join_paths(meson.current_build_dir(), 'iptsd.service'),
|
||||
+######## install_dir: unitdir
|
||||
+########)
|
||||
|
||||
- install_data('etc/udev/50-ipts.rules', install_dir: rulesdir)
|
||||
+ install_data('etc/udev/50-ipts.rules', install_dir: '@UDEVRULESDIR@')
|
||||
endif
|
||||
|
||||
if service_manager.contains('openrc')
|
||||
Reference in New Issue
Block a user