fix(droidcam): set correct make flags
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2025-02-18 19:39:30 -05:00
parent c68b08d4b6
commit e67ed81736
2 changed files with 22 additions and 8 deletions

View file

@ -10,7 +10,9 @@ final: prev: {
}); });
# FIXME: https://pr-tracker.nelim.org/?pr=382559 # 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 prev.obs-studio-plugins
// { // {
droidcam-obs = prev.obs-studio-plugins.droidcam-obs.overrideAttrs (o: rec { droidcam-obs = prev.obs-studio-plugins.droidcam-obs.overrideAttrs (o: rec {
@ -22,12 +24,23 @@ final: prev: {
sha256 = "sha256-KWMLhddK561xA+EjvoG4tXRW4xoLil31JcTTfppblmA="; sha256 = "sha256-KWMLhddK561xA+EjvoG4tXRW4xoLil31JcTTfppblmA=";
}; };
postPatch = ""; postPatch = "";
makeFlags =
o.makeFlags nativeBuildInputs = [
++ [ pkg-config
"LIBOBS_INCLUDES=${prev.obs-studio}/include/obs" ];
"FFMPEG_INCLUDES=${prev.lib.getLib prev.ffmpeg}"
]; # 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"
];
}); });
}; };
} }

View file

@ -1,5 +1,6 @@
{...}: python3Packages: final: prev: { {...}: 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 { tinytuya = prev.tinytuya.overridePythonAttrs (o: rec {
version = "1.16.1"; version = "1.16.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {