iptsd: 0.5.1 -> 1.0.0

Diff: https://github.com/linux-surface/iptsd/compare/v0.5.1...v1.0.0

Changelog: https://github.com/linux-surface/iptsd/releases/tag/v1.0.0

1 files changed, 39 insertions, 9 deletions

diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix
index 4a3262efa4b1b..52872f3fbdb06 100644
--- a/pkgs/applications/misc/iptsd/default.nix
+++ b/pkgs/applications/misc/iptsd/default.nix
@@ -1,37 +1,67 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, systemd, inih }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, meson
+, ninja
+, pkg-config
+, cli11
+, hidrd
+, inih
+, microsoft_gsl
+, spdlog
+, systemd
+}:
 
 stdenv.mkDerivation rec {
   pname = "iptsd";
-  version = "0.5.1";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "linux-surface";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-du5TC3I5+hWifjdnaeTj2QPJ6/oTXZqaOrZJkef/USU=";
+    hash = "sha256-fd/WZXRvJb6XCATNmPj2xi1UseoZqBT9IN21iwxHGLs=";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    meson
+    ninja
+    pkg-config
+  ];
+
+  dontUseCmakeConfigure = true;
 
-  buildInputs = [ systemd inih ];
+  buildInputs = [
+    cli11
+    hidrd
+    inih
+    microsoft_gsl
+    spdlog
+    systemd
+  ];
 
   # Original installs udev rules and service config into global paths
   postPatch = ''
-    substituteInPlace meson.build \
+    substituteInPlace etc/meson.build \
       --replace "install_dir: unitdir" "install_dir: datadir" \
       --replace "install_dir: rulesdir" "install_dir: datadir" \
   '';
+
   mesonFlags = [
     "-Dservice_manager=systemd"
     "-Dsample_config=false"
-    "-Ddebug_tool=false"
+    "-Ddebug_tools="
+    "-Db_lto=false"  # plugin needed to handle lto object -> undefined reference to ...
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/linux-surface/iptsd/releases/tag/${src.rev}";
     description = "Userspace daemon for Intel Precise Touch & Stylus";
     homepage = "https://github.com/linux-surface/iptsd";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ tomberek ];
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ tomberek dotlambda ];
     platforms = platforms.linux;
   };
 }