From db4f22badaaff57ad49cb8657aebedc5f75e9565 Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Thu, 25 Sep 2025 01:13:38 +0200 Subject: [PATCH] hyperion-ng: 2.0.16 -> 2.1.1 --- .../applications/video/hyperion-ng/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index 0ba323dc5ef7..2d93d676e374 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, cmake, + gitMinimal, wrapQtAppsHook, perl, flatbuffers, @@ -11,6 +12,7 @@ alsa-lib, hidapi, libcec, + libftdi1, libusb1, libX11, libxcb, @@ -20,19 +22,20 @@ qtserialport, qtsvg, qtx11extras, + qtwebsockets, withRPiDispmanx ? false, libraspberrypi, }: stdenv.mkDerivation rec { pname = "hyperion.ng"; - version = "2.0.16"; + version = "2.1.1"; src = fetchFromGitHub { owner = "hyperion-project"; repo = "hyperion.ng"; rev = version; - hash = "sha256-nQPtJw9DOKMPGI5trxZxpP+z2PYsbRKqOQEyaGzvmmA="; + hash = "sha256-lKLXgOrXp8DLmlpQe/33A30l4K9VX8P0q2LUA+lLYws="; # needed for `dependencies/external/`: # * rpi_ws281x` - not possible to use as a "system" lib # * qmdnsengine - not in nixpkgs yet @@ -42,6 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib hidapi + libftdi1 libusb1 libX11 libxcb @@ -53,6 +57,7 @@ stdenv.mkDerivation rec { qtbase qtserialport qtsvg + qtwebsockets qtx11extras ] ++ lib.optional stdenv.hostPlatform.isLinux libcec @@ -60,6 +65,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + gitMinimal wrapQtAppsHook ] ++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle @@ -72,12 +78,16 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_DEPLOY_DEPENDENCIES=OFF" "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON" - "-DUSE_SYSTEM_PROTO_LIBS=ON" + "-DUSE_SYSTEM_LIBFTDI_LIBS=ON" "-DUSE_SYSTEM_MBEDTLS_LIBS=ON" + "-DUSE_SYSTEM_PROTO_LIBS=ON" # "-DUSE_SYSTEM_QMDNS_LIBS=ON" # qmdnsengine not in nixpkgs yet "-DENABLE_TESTS=ON" ] - ++ lib.optional (withRPiDispmanx == false) "-DENABLE_DISPMANX=OFF"; + ++ lib.optional (withRPiDispmanx == false) "-DENABLE_DISPMANX=OFF" + ++ lib.optional ( + stdenv.hostPlatform.system == "aarch64-linux" + ) "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"; # required to build dependencies/external/rpi_ws281x doCheck = true; checkPhase = ''