From b613c266ed3113378ac0b550e418c21b5ead56b9 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Sat, 10 Aug 2024 21:51:35 +0100 Subject: [PATCH] Patch out libdatachannel in camera-streamer --- .../0001-Disable-libdatachannel.patch | 25 +++++++++++++++++++ pkgs/camera-streamer/package.nix | 15 ++++++----- 2 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 pkgs/camera-streamer/0001-Disable-libdatachannel.patch diff --git a/pkgs/camera-streamer/0001-Disable-libdatachannel.patch b/pkgs/camera-streamer/0001-Disable-libdatachannel.patch new file mode 100644 index 0000000..0c41498 --- /dev/null +++ b/pkgs/camera-streamer/0001-Disable-libdatachannel.patch @@ -0,0 +1,25 @@ +From 0f17bb86772afe9495891e420a809a0b3c071caf Mon Sep 17 00:00:00 2001 +From: Jordan Holt +Date: Sat, 10 Aug 2024 15:37:15 +0100 +Subject: [PATCH] Disable libdatachannel + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index d5029bd..e50ba1a 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,7 +23,7 @@ USE_HW_H264 ?= 1 + USE_FFMPEG ?= $(shell pkg-config libavutil libavformat libavcodec && echo 1) + USE_LIBCAMERA ?= $(shell pkg-config libcamera && echo 1) + USE_RTSP ?= $(shell pkg-config live555 && echo 1) +-USE_LIBDATACHANNEL ?= $(shell [ -e $(LIBDATACHANNEL_PATH)/CMakeLists.txt ] && echo 1) ++USE_LIBDATACHANNEL ?= 0 + + ifeq (1,$(DEBUG)) + CFLAGS += -g +-- +2.44.1 + diff --git a/pkgs/camera-streamer/package.nix b/pkgs/camera-streamer/package.nix index c2bf2f5..f23028a 100644 --- a/pkgs/camera-streamer/package.nix +++ b/pkgs/camera-streamer/package.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitea +, fetchFromGitHub , cmake , gnumake @@ -24,15 +24,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "camera-streamer"; version = "0.2.8"; - src = fetchFromGitea { - domain = "git.vimium.com"; - owner = "jordan"; + src = fetchFromGitHub { + owner = "ayufan"; repo = "camera-streamer"; - rev = "464f05172c725b4b302464eecdb8b6e85fda6e84"; - hash = "sha256-IkLR/oozYU+hfpct+GXej2T3GEhauQtqwWOcrQAErbM="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-8vV8BMFoDeh22I1/qxk6zttJROaD/lrThBxXHZSPpT4="; fetchSubmodules = true; }; + patches = [ + ./0001-Disable-libdatachannel.patch + ]; + # Second replacement fixes literal newline in generated version.h. postPatch = '' substituteInPlace Makefile \