Compare commits
5 Commits
c9fa49b24d
...
1cb6482106
Author | SHA1 | Date | |
---|---|---|---|
1cb6482106
|
|||
3323f930d3
|
|||
37d56b613e
|
|||
6205824c0d
|
|||
b613c266ed
|
@@ -67,6 +67,7 @@
|
|||||||
overlays = [
|
overlays = [
|
||||||
agenix.overlays.default
|
agenix.overlays.default
|
||||||
(import ./overlays/gnome.nix)
|
(import ./overlays/gnome.nix)
|
||||||
|
(import ./overlays/default.nix)
|
||||||
(
|
(
|
||||||
final: prev: {
|
final: prev: {
|
||||||
unstable = import inputs.nixpkgs-unstable { system = final.system; };
|
unstable = import inputs.nixpkgs-unstable { system = final.system; };
|
||||||
|
@@ -46,7 +46,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
services.udev.extraRules = ''
|
services.udev.extraRules = ''
|
||||||
SUBSYSTEM="dma_heap", GROUP="video", MODE="0600"
|
SUBSYSTEM=="rpivid-*", GROUP="video", MODE="0660"
|
||||||
|
KERNEL=="vcsm-cma", GROUP="video", MODE="0660"
|
||||||
|
SUBSYSTEM=="dma_heap", GROUP="video", MODE="0660"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
@@ -82,6 +84,8 @@
|
|||||||
--host=0.0.0.0 \
|
--host=0.0.0.0 \
|
||||||
--resolution=4608x2592
|
--resolution=4608x2592
|
||||||
'';
|
'';
|
||||||
|
DynamicUser = "yes";
|
||||||
|
SupplementaryGroups = [ "video" ];
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
RestartSec = 10;
|
RestartSec = 10;
|
||||||
};
|
};
|
||||||
@@ -90,6 +94,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
camera-streamer
|
||||||
git
|
git
|
||||||
neovim
|
neovim
|
||||||
libcamera
|
libcamera
|
||||||
|
25
overlays/0001-Ignore-IPA-signing.patch
Normal file
25
overlays/0001-Ignore-IPA-signing.patch
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
From 625939e594ce255afa3fab3a40c3e524460e1f8b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jordan Holt <jordan@vimium.com>
|
||||||
|
Date: Sat, 10 Aug 2024 18:28:08 +0100
|
||||||
|
Subject: [PATCH] Ignore IPA signing
|
||||||
|
|
||||||
|
---
|
||||||
|
src/libcamera/ipa_manager.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
|
||||||
|
index 6d5bbd05..43004175 100644
|
||||||
|
--- a/src/libcamera/ipa_manager.cpp
|
||||||
|
+++ b/src/libcamera/ipa_manager.cpp
|
||||||
|
@@ -295,7 +295,7 @@ bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const
|
||||||
|
if (data.empty())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
- bool valid = pubKey_.verify(data, ipa->signature());
|
||||||
|
+ bool valid = true;
|
||||||
|
|
||||||
|
LOG(IPAManager, Debug)
|
||||||
|
<< "IPA module " << ipa->path() << " signature is "
|
||||||
|
--
|
||||||
|
2.44.1
|
||||||
|
|
@@ -7,6 +7,7 @@ final: prev:
|
|||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./0001-Remove-relative-config-lookups.patch
|
./0001-Remove-relative-config-lookups.patch
|
||||||
|
./0001-Ignore-IPA-signing.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
mesonFlags = old.mesonFlags ++ [
|
mesonFlags = old.mesonFlags ++ [
|
||||||
|
25
pkgs/camera-streamer/0001-Disable-libdatachannel.patch
Normal file
25
pkgs/camera-streamer/0001-Disable-libdatachannel.patch
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
From 0f17bb86772afe9495891e420a809a0b3c071caf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jordan Holt <jordan@vimium.com>
|
||||||
|
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
|
||||||
|
|
@@ -1,5 +1,5 @@
|
|||||||
{ stdenv
|
{ stdenv
|
||||||
, fetchFromGitea
|
, fetchFromGitHub
|
||||||
|
|
||||||
, cmake
|
, cmake
|
||||||
, gnumake
|
, gnumake
|
||||||
@@ -24,15 +24,18 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
pname = "camera-streamer";
|
pname = "camera-streamer";
|
||||||
version = "0.2.8";
|
version = "0.2.8";
|
||||||
|
|
||||||
src = fetchFromGitea {
|
src = fetchFromGitHub {
|
||||||
domain = "git.vimium.com";
|
owner = "ayufan";
|
||||||
owner = "jordan";
|
|
||||||
repo = "camera-streamer";
|
repo = "camera-streamer";
|
||||||
rev = "464f05172c725b4b302464eecdb8b6e85fda6e84";
|
rev = "refs/tags/v${finalAttrs.version}";
|
||||||
hash = "sha256-IkLR/oozYU+hfpct+GXej2T3GEhauQtqwWOcrQAErbM=";
|
hash = "sha256-8vV8BMFoDeh22I1/qxk6zttJROaD/lrThBxXHZSPpT4=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./0001-Disable-libdatachannel.patch
|
||||||
|
];
|
||||||
|
|
||||||
# Second replacement fixes literal newline in generated version.h.
|
# Second replacement fixes literal newline in generated version.h.
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace Makefile \
|
substituteInPlace Makefile \
|
||||||
|
Reference in New Issue
Block a user