From e67ed81736f9f49eb093608d4dd3a749de8d4f73 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 18 Feb 2025 19:39:30 -0500 Subject: [PATCH] fix(droidcam): set correct make flags --- overlays/misc-fixes/default.nix | 27 ++++++++++++++----- .../hass-components/tuya-local/overrides.nix | 3 ++- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/overlays/misc-fixes/default.nix b/overlays/misc-fixes/default.nix index d2b9abab..6d696771 100644 --- a/overlays/misc-fixes/default.nix +++ b/overlays/misc-fixes/default.nix @@ -10,7 +10,9 @@ final: prev: { }); # FIXME: https://pr-tracker.nelim.org/?pr=382559 - obs-studio-plugins = + obs-studio-plugins = let + inherit (prev) lib libjpeg libimobiledevice obs-studio ffmpeg pkg-config; + in prev.obs-studio-plugins // { droidcam-obs = prev.obs-studio-plugins.droidcam-obs.overrideAttrs (o: rec { @@ -22,12 +24,23 @@ final: prev: { sha256 = "sha256-KWMLhddK561xA+EjvoG4tXRW4xoLil31JcTTfppblmA="; }; postPatch = ""; - makeFlags = - o.makeFlags - ++ [ - "LIBOBS_INCLUDES=${prev.obs-studio}/include/obs" - "FFMPEG_INCLUDES=${prev.lib.getLib prev.ffmpeg}" - ]; + + nativeBuildInputs = [ + pkg-config + ]; + + # Flag reference in regard to: + # https://github.com/dev47apps/droidcam-obs-plugin/blob/master/linux/linux.mk + makeFlags = [ + "ALLOW_STATIC=no" + "JPEG_DIR=${lib.getDev libjpeg}" + "JPEG_LIB=${lib.getLib libjpeg}/lib" + "IMOBILEDEV_DIR=${lib.getLib libimobiledevice}" + "LIBOBS_INCLUDES=${obs-studio}/include/obs" + "FFMPEG_INCLUDES=${lib.getLib ffmpeg}" + "LIBUSBMUXD=libusbmuxd-2.0" + "LIBIMOBILEDEV=libimobiledevice-1.0" + ]; }); }; } diff --git a/scopedPackages/hass-components/tuya-local/overrides.nix b/scopedPackages/hass-components/tuya-local/overrides.nix index 443c2ce2..2f0a2de8 100644 --- a/scopedPackages/hass-components/tuya-local/overrides.nix +++ b/scopedPackages/hass-components/tuya-local/overrides.nix @@ -1,5 +1,6 @@ {...}: python3Packages: final: prev: { - /* Keep this here to make it easier to always have the right version + /* + Keep this here to make it easier to always have the right version tinytuya = prev.tinytuya.overridePythonAttrs (o: rec { version = "1.16.1"; src = pkgs.fetchFromGitHub {