From 4d29ae7f2df1e83ff2e1f7e9088d06c3f6648a18 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Sun, 16 Nov 2025 15:23:11 -0500 Subject: [PATCH 1/2] hidviz: drive-by improvements --- pkgs/by-name/hi/hidviz/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hi/hidviz/package.nix b/pkgs/by-name/hi/hidviz/package.nix index 93a5d909e20d..d7a21149656e 100644 --- a/pkgs/by-name/hi/hidviz/package.nix +++ b/pkgs/by-name/hi/hidviz/package.nix @@ -11,18 +11,18 @@ asio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hidviz"; version = "0.2.1"; src = fetchFromGitHub { owner = "hidviz"; repo = "hidviz"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ThDDQ3FN+cLCbdQCrC5zhL4dgg2zAbRWvtei7+qmQg8="; }; - preConfigure = '' + postPatch = '' substituteInPlace libhidx/cmake_modules/Findasio.cmake --replace-fail '/usr/include/asio' '${lib.getDev asio}/include/asio' substituteInPlace libhidx/libhidx/src/Connector.cc --replace-fail '/usr/local/libexec' "$out/libexec" ''; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ ]; }; -} +}) From 208b4602baaf989ac3cb65dd6efed24e07fa5960 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Sun, 16 Nov 2025 15:23:11 -0500 Subject: [PATCH 2/2] hidviz: bump cmake minimum version --- pkgs/by-name/hi/hidviz/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/hi/hidviz/package.nix b/pkgs/by-name/hi/hidviz/package.nix index d7a21149656e..906660f7dfd9 100644 --- a/pkgs/by-name/hi/hidviz/package.nix +++ b/pkgs/by-name/hi/hidviz/package.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' + substituteInPlace {hidviz,libhidx{,/libhidx{,_server{,_daemon}}}}/CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 3.2)' 'cmake_minimum_required(VERSION 3.10)' substituteInPlace libhidx/cmake_modules/Findasio.cmake --replace-fail '/usr/include/asio' '${lib.getDev asio}/include/asio' substituteInPlace libhidx/libhidx/src/Connector.cc --replace-fail '/usr/local/libexec' "$out/libexec" '';