Merge pull request #204527 from nvmd/master+hyperion

maintainers/maintainer-list.nix

@@ -7896,6 +7896,12 @@
     githubId = 1047859;
     name = "Kaz Wesley";
   };
+  kazenyuk = {
+    email = "kazenyuk@pm.me";
+    github = "nvmd";
+    githubId = 524492;
+    name = "Sergey Kazenyuk";
+  };
   kcalvinalvin = {
     email = "calvin@kcalvinalvin.info";
     github = "kcalvinalvin";

pkgs/applications/video/hyperion-ng/default.nix

@@ -1,51 +1,73 @@
-{ stdenv, avahi-compat, cmake, fetchFromGitHub, flatbuffers, hidapi, lib, libcec
-, libusb1, libX11, libxcb, libXrandr, mbedtls, mkDerivation, protobuf, python3
-, qtbase, qtserialport, qtsvg, qtx11extras, wrapQtAppsHook }:
+{ stdenv, lib, fetchFromGitHub
+, cmake, wrapQtAppsHook, perl
+, flatbuffers, protobuf, mbedtls
+, hidapi, libcec, libusb1
+, libX11, libxcb, libXrandr, python3
+, qtbase, qtserialport, qtsvg, qtx11extras
+, withRPiDispmanx ? false, libraspberrypi
+}:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "hyperion.ng";
-  version = "2.0.12";
+  version = "2.0.14";
 
   src = fetchFromGitHub {
     owner = "hyperion-project";
     repo = pname;
     rev = version;
-    sha256 = "sha256-J31QaWwGNhIpnZmWN9lZEI6fC0VheY5X8fGchQqtAlQ=";
+    sha256 = "sha256-Y1PZ+YyPMZEX4fBpMG6IVT1gtXR9ZHlavJMCQ4KAenc=";
+    # needed for `dependencies/external/`:
+    # * rpi_ws281x` - not possible to use as a "system" lib
+    # * qmdnsengine - not in nixpkgs yet
+    fetchSubmodules = true;
   };
 
   buildInputs = [
-    avahi-compat
-    flatbuffers
     hidapi
-    libcec
     libusb1
     libX11
     libxcb
     libXrandr
-    mbedtls
+    flatbuffers
     protobuf
+    mbedtls
     python3
     qtbase
     qtserialport
     qtsvg
     qtx11extras
-  ];
+  ] ++ lib.optional stdenv.isLinux libcec
+    ++ lib.optional withRPiDispmanx libraspberrypi;
 
-  nativeBuildInputs = [ cmake wrapQtAppsHook ];
+  nativeBuildInputs = [
+    cmake wrapQtAppsHook
+  ] ++ lib.optional stdenv.isDarwin perl; # for macos bundle
+
+  patchPhase =  ''
+    patchShebangs test/testrunner.sh
+    patchShebangs src/hyperiond/CMakeLists.txt
+  '' ;
 
   cmakeFlags = [
     "-DCMAKE_BUILD_TYPE=Release"
-    "-DUSE_SYSTEM_MBEDTLS_LIBS=ON"
+    "-DENABLE_DEPLOY_DEPENDENCIES=OFF"
     "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON"
     "-DUSE_SYSTEM_PROTO_LIBS=ON"
-  ];
+    "-DUSE_SYSTEM_MBEDTLS_LIBS=ON"
+    # "-DUSE_SYSTEM_QMDNS_LIBS=ON"  # qmdnsengine not in nixpkgs yet
+    "-DENABLE_TESTS=ON"
+  ] ++ lib.optional (withRPiDispmanx == false) "-DENABLE_DISPMANX=OFF";
+
+  doCheck = true;
+  checkPhase = ''
+    cd ../ && ./test/testrunner.sh && cd -
+  '';
 
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
-    description = "Open Source Ambilight solution";
+    description = "An opensource Bias or Ambient Lighting implementation";
     homepage = "https://github.com/hyperion-project/hyperion.ng";
     license = licenses.mit;
-    maintainers = with maintainers; [ algram ];
+    maintainers = with maintainers; [ algram kazenyuk ];
     platforms = platforms.unix;
   };
 }