jordan/nix-config
1
1
Fork 0
Code Issues 14 Pull Requests Actions Projects 3 Wiki Activity

Add deploy step and update camera-streamer

Browse Source
This commit is contained in:
Jordan Holt 2024-08-05 17:55:10 +01:00
parent 5903eb650a
commit be105b8565
Signed by: jordan
GPG Key ID: B8CFFF61F1CCF520
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flake.nix
View File

@ -148,14 +148,22 @@
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.vps1; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.vps1;
}; };
}; };
# pi = { pi = {
# hostname = "10.0.1.191"; hostname = "10.0.1.191";
#
# profiles.system = { profiles.system = {
# user = "root"; user = "root";
# path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pi; path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pi;
# }; };
# }; };
skycam = {
hostname = "10.0.1.146";
profiles.system = {
user = "root";
path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.skycam;
};
};
}; };
}; };

15
pkgs/camera-streamer/package.nix
View File

@ -1,5 +1,5 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitea
, cmake , cmake
, gnumake , gnumake
@ -12,9 +12,9 @@
, ffmpeg , ffmpeg
, libcameraSupport ? true , libcameraSupport ? true
, libcamera , libcamera
, rtspSupport ? true , rtspSupport ? false
, live555 , live555
, webrtcSupport ? true , webrtcSupport ? false
, openssl , openssl
, lib , lib
@ -24,11 +24,12 @@ stdenv.mkDerivation (finalAttrs: {
pname = "camera-streamer"; pname = "camera-streamer";
version = "0.2.8"; version = "0.2.8";
src = fetchFromGitHub { src = fetchFromGitea {
owner = "ayufan"; domain = "git.vimium.com";
owner = "jordan";
repo = "camera-streamer"; repo = "camera-streamer";
rev = "refs/tags/v${finalAttrs.version}"; rev = "464f05172c725b4b302464eecdb8b6e85fda6e84";
hash = "sha256-8vV8BMFoDeh22I1/qxk6zttJROaD/lrThBxXHZSPpT4="; hash = "sha256-IkLR/oozYU+hfpct+GXej2T3GEhauQtqwWOcrQAErbM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };