From f3e1b53fbe3b594426561524e23fb324e1862cd2 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 16 Feb 2025 16:09:36 +0300 Subject: [PATCH 1/4] droidcam-obs: modernize package Gets rid of `rec` and nested `with lib`. Also replaces `rev` with `tag`. --- .../plugins/droidcam-obs/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix index 9497f8451854..172832cc16f0 100644 --- a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix @@ -10,22 +10,22 @@ libplist, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "droidcam-obs"; version = "2.0.2"; src = fetchFromGitHub { owner = "dev47apps"; repo = "droidcam-obs-plugin"; - rev = version; + tag = finalAttrs.version; sha256 = "sha256-YtfWwgBhyQYx6QfrKld7p6qUf8BEV/kkQX4QcdHuaYU="; }; postPatch = '' substituteInPlace ./linux/linux.mk \ - --replace "-limobiledevice" "-limobiledevice-1.0" \ - --replace "-I/usr/include/obs" "-I${obs-studio}/include/obs" \ - --replace "-I/usr/include/ffmpeg" "-I${ffmpeg}/include" + --replace-fail "-limobiledevice" "-limobiledevice-1.0" \ + --replace-fail "-I/usr/include/obs" "-I${obs-studio}/include/obs" \ + --replace-fail "-I/usr/include/ffmpeg" "-I${ffmpeg}/include" ''; preBuild = '' @@ -61,12 +61,11 @@ stdenv.mkDerivation rec { doCheck = false; - meta = with lib; { + meta = { description = "DroidCam OBS"; homepage = "https://github.com/dev47apps/droidcam-obs-plugin"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ulrikstrid ]; - platforms = platforms.linux; - broken = true; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ulrikstrid ]; + platforms = lib.platforms.linux; }; -} +}) From aa31678d29ed5b184c0bed6de7669b685265c1e5 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 16 Feb 2025 16:24:34 +0300 Subject: [PATCH 2/4] droidcam-obs: 2.0.2 -> 2.3.4 --- .../obs-studio/plugins/droidcam-obs/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix index 172832cc16f0..6374ead07ec0 100644 --- a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix @@ -12,22 +12,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "droidcam-obs"; - version = "2.0.2"; + version = "2.3.4"; src = fetchFromGitHub { owner = "dev47apps"; repo = "droidcam-obs-plugin"; tag = finalAttrs.version; - sha256 = "sha256-YtfWwgBhyQYx6QfrKld7p6qUf8BEV/kkQX4QcdHuaYU="; + sha256 = "sha256-KWMLhddK561xA+EjvoG4tXRW4xoLil31JcTTfppblmA="; }; - postPatch = '' - substituteInPlace ./linux/linux.mk \ - --replace-fail "-limobiledevice" "-limobiledevice-1.0" \ - --replace-fail "-I/usr/include/obs" "-I${obs-studio}/include/obs" \ - --replace-fail "-I/usr/include/ffmpeg" "-I${ffmpeg}/include" - ''; - preBuild = '' mkdir ./build ''; @@ -46,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: { "JPEG_DIR=${lib.getDev libjpeg}" "JPEG_LIB=${lib.getLib libjpeg}/lib" "IMOBILEDEV_DIR=${libimobiledevice}" + "LIBOBS_INCLUDES=${obs-studio}/include/obs" + "FFMPEG_INCLUDES=${lib.getLib ffmpeg}" ]; installPhase = '' From 7778a2649e875c5c899efde2ac87be2790067c67 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 18 Feb 2025 10:21:27 +0300 Subject: [PATCH 3/4] droidcam-obs: explicit make flags --- .../obs-studio/plugins/droidcam-obs/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix index 6374ead07ec0..87ca4a0a0ad3 100644 --- a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix @@ -8,8 +8,8 @@ libimobiledevice, libusbmuxd, libplist, + pkg-config, }: - stdenv.mkDerivation (finalAttrs: { pname = "droidcam-obs"; version = "2.3.4"; @@ -34,13 +34,22 @@ stdenv.mkDerivation (finalAttrs: { 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=${libimobiledevice}" + "IMOBILEDEV_DIR=${lib.getDev libimobiledevice}" + "IMOBILEDEV_DIR=${lib.getLib libimobiledevice}" "LIBOBS_INCLUDES=${obs-studio}/include/obs" "FFMPEG_INCLUDES=${lib.getLib ffmpeg}" + "LIBUSBMUXD=libusbmuxd-2.0" + "LIBIMOBILEDEV=libimobiledevice-1.0" ]; installPhase = '' From b75edecb799b9529a35c650dee81b51573821adf Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 9 Mar 2025 23:57:21 +0300 Subject: [PATCH 4/4] droidcam-obs: add NotAShelf to maintainers --- .../video/obs-studio/plugins/droidcam-obs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix index 87ca4a0a0ad3..07b8110070fc 100644 --- a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { description = "DroidCam OBS"; homepage = "https://github.com/dev47apps/droidcam-obs-plugin"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ulrikstrid ]; + maintainers = with lib.maintainers; [ NotAShelf ]; platforms = lib.platforms.linux; }; })