Fix udev rules on skycam

Add camera-streamer package to skycam
Patch out IPA signature validation in libcamera
2024-08-10 21:53:25 +01:00 · 2024-08-10 21:53:09 +01:00 · 2024-08-10 21:52:45 +01:00 · 2024-08-10 21:52:20 +01:00 · 2024-08-10 21:51:35 +01:00 · 2024-08-09 22:06:19 +01:00
13 changed files with 193 additions and 274 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -107,11 +107,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722821805,
-        "narHash": "sha256-FGrUPUD+LMDwJsYyNSxNIzFMldtCm8wXiQuyL2PHSrM=",
+        "lastModified": 1723080788,
+        "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "0257e44f4ad472b54f19a6dd1615aee7fa48ed49",
+        "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed",
        "type": "github"
      },
      "original": {
@@ -123,11 +123,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1721276923,
-        "narHash": "sha256-HJKuwVvi+yGv+8n9Ez4EwaJA0B79JRss9J30vpgy/GI=",
+        "lastModified": 1723137499,
+        "narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "cc70ec20e2775df7cd2bccdd20dcdecc3e0a733b",
+        "rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70",
        "type": "github"
      },
      "original": {
@@ -233,11 +233,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721042469,
-        "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
+        "lastModified": 1722857853,
+        "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
+        "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da",
        "type": "github"
      },
      "original": {
@@ -365,40 +365,6 @@
        "type": "github"
      }
    },
-    "libcamera-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1718617480,
-        "narHash": "sha256-qqEMJzMotybf1nJp1dsz3zc910Qj0TmqCm1CwuSb1VY=",
-        "owner": "raspberrypi",
-        "repo": "libcamera",
-        "rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "raspberrypi",
-        "repo": "libcamera",
-        "rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a",
-        "type": "github"
-      }
-    },
-    "libpisp-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1718613892,
-        "narHash": "sha256-V/d4RrXoq8HNc8r/Kr1gH3E7YTZzfIdgbaJtq/Xi7uQ=",
-        "owner": "raspberrypi",
-        "repo": "libpisp",
-        "rev": "b567f04556801ca350331ed21a1ae3eef4675c23",
-        "type": "github"
-      },
-      "original": {
-        "owner": "raspberrypi",
-        "ref": "v1.0.6",
-        "repo": "libpisp",
-        "type": "github"
-      }
-    },
    "nix-darwin": {
      "inputs": {
        "nixpkgs": [
@@ -407,11 +373,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722609272,
-        "narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=",
+        "lastModified": 1722924007,
+        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49",
+        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
        "type": "github"
      },
      "original": {
@@ -422,11 +388,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1722332872,
-        "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
+        "lastModified": 1723149858,
+        "narHash": "sha256-3u51s7jdhavmEL1ggtd8wqrTH2clTy5yaZmhLvAXTqc=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
+        "rev": "107bb46eef1f05e86fc485ee8af9b637e5157988",
        "type": "github"
      },
      "original": {
@@ -493,11 +459,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1722630782,
-        "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
+        "lastModified": 1722813957,
+        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
+        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
        "type": "github"
      },
      "original": {
@@ -524,11 +490,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1722791413,
-        "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=",
+        "lastModified": 1722987190,
+        "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c",
+        "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
        "type": "github"
      },
      "original": {
@@ -537,22 +503,6 @@
        "type": "indirect"
      }
    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1722651103,
-        "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixvim": {
      "inputs": {
        "devshell": "devshell",
@@ -567,11 +517,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1722688115,
-        "narHash": "sha256-Ubk5KzAp2Z4Dzmi81aGgabvy41QXjZMwNikDYm7+jS0=",
+        "lastModified": 1722925293,
+        "narHash": "sha256-saXm5dd/e3PMsYTEcp1Qbzifm3KsZtNFkrWjmLhXHGE=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "4e6974c619bd280789ef3697a73fcf7c20f70819",
+        "rev": "170df9814c3e41d5a4d6e3339e611801b1f02ce2",
        "type": "github"
      },
      "original": {
@@ -591,11 +541,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722804745,
-        "narHash": "sha256-l6N3QaiDqN2QmHDAxjczQPLPCTv+Kp7PsrtJBltmhTo=",
+        "lastModified": 1723232379,
+        "narHash": "sha256-F4Y3f9305aHGWKqAd3s2GyNRONdpDBuNuK4TCSdaHz8=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "61d9342fb471cd3c45a047406428fba7b6fb49ad",
+        "rev": "22bea90404c5ff6457913a03c1a54a3caa5b1c57",
        "type": "github"
      },
      "original": {
@@ -604,33 +554,6 @@
        "type": "github"
      }
    },
-    "raspberry-pi-nix": {
-      "inputs": {
-        "libcamera-src": "libcamera-src",
-        "libpisp-src": "libpisp-src",
-        "nixpkgs": "nixpkgs_4",
-        "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
-        "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
-        "rpi-firmware-src": "rpi-firmware-src",
-        "rpi-linux-6_10_0-rc5-src": "rpi-linux-6_10_0-rc5-src",
-        "rpi-linux-6_6_31-src": "rpi-linux-6_6_31-src",
-        "rpicam-apps-src": "rpicam-apps-src",
-        "u-boot-src": "u-boot-src"
-      },
-      "locked": {
-        "lastModified": 1722525809,
-        "narHash": "sha256-LTCbMSKbSHvKubfXolss39UeTKDIoP9wWTyXV/tDPHU=",
-        "owner": "nix-community",
-        "repo": "raspberry-pi-nix",
-        "rev": "35bb455fdeb495043a94433f67e05fa88980cdad",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "raspberry-pi-nix",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "agenix": "agenix",
@@ -646,113 +569,10 @@
        "nixpkgs-unstable": "nixpkgs-unstable",
        "nixvim": "nixvim",
        "plasma-manager": "plasma-manager",
-        "raspberry-pi-nix": "raspberry-pi-nix",
        "secrets": "secrets",
        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
      }
    },
-    "rpi-bluez-firmware-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1708969706,
-        "narHash": "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q=",
-        "owner": "RPi-Distro",
-        "repo": "bluez-firmware",
-        "rev": "78d6a07730e2d20c035899521ab67726dc028e1c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "RPi-Distro",
-        "ref": "bookworm",
-        "repo": "bluez-firmware",
-        "type": "github"
-      }
-    },
-    "rpi-firmware-nonfree-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1708967191,
-        "narHash": "sha256-BGq0+cr+xBRwQM/LqiQuRWuZpQsKM5jfcrNCqWMuVzM=",
-        "owner": "RPi-Distro",
-        "repo": "firmware-nonfree",
-        "rev": "223ccf3a3ddb11b3ea829749fbbba4d65b380897",
-        "type": "github"
-      },
-      "original": {
-        "owner": "RPi-Distro",
-        "ref": "bookworm",
-        "repo": "firmware-nonfree",
-        "type": "github"
-      }
-    },
-    "rpi-firmware-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716978780,
-        "narHash": "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=",
-        "owner": "raspberrypi",
-        "repo": "firmware",
-        "rev": "3590de0c181d433af368a95f15bc480bdaff8b47",
-        "type": "github"
-      },
-      "original": {
-        "owner": "raspberrypi",
-        "ref": "1.20240529",
-        "repo": "firmware",
-        "type": "github"
-      }
-    },
-    "rpi-linux-6_10_0-rc5-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1719265450,
-        "narHash": "sha256-xd/Pz/uZFYW9hJIFKryWDE9Aks6f2EIvEDCmfk0C70c=",
-        "owner": "raspberrypi",
-        "repo": "linux",
-        "rev": "f61d3aca8045e70d64b55f7b98f083738f639ad2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "raspberrypi",
-        "ref": "rpi-6.10.y",
-        "repo": "linux",
-        "type": "github"
-      }
-    },
-    "rpi-linux-6_6_31-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716545726,
-        "narHash": "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink=",
-        "owner": "raspberrypi",
-        "repo": "linux",
-        "rev": "c1432b4bae5b6582f4d32ba381459f33c34d1424",
-        "type": "github"
-      },
-      "original": {
-        "owner": "raspberrypi",
-        "ref": "stable_20240529",
-        "repo": "linux",
-        "type": "github"
-      }
-    },
-    "rpicam-apps-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1717081637,
-        "narHash": "sha256-s4zJh6r3VhiquO54KWZ78dVCH1BmlphY9zEB9BidNyo=",
-        "owner": "raspberrypi",
-        "repo": "rpicam-apps",
-        "rev": "49344f2a8d1817558d4e6463032fcf11be618b38",
-        "type": "github"
-      },
-      "original": {
-        "owner": "raspberrypi",
-        "ref": "v1.5.0",
-        "repo": "rpicam-apps",
-        "type": "github"
-      }
-    },
    "secrets": {
      "flake": false,
      "locked": {
@@ -851,19 +671,6 @@
        "type": "github"
      }
    },
-    "u-boot-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1712055538,
-        "narHash": "sha256-IlaDdjKq/Pq2orzcU959h93WXRZfvKBGDO/MFw9mZMg=",
-        "type": "tarball",
-        "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2"
-      }
-    },
    "utils": {
      "inputs": {
        "systems": "systems_2"
--- a/flake.nix
+++ b/flake.nix
@@ -41,9 +41,6 @@
      inputs.nixpkgs.follows = "nixpkgs";
      inputs.home-manager.follows = "home-manager";
    };
-    raspberry-pi-nix = {
-      url = "github:nix-community/raspberry-pi-nix";
-    };
    secrets = {
      url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
      flake = false;
@@ -70,7 +67,7 @@
      overlays = [
        agenix.overlays.default
        (import ./overlays/gnome.nix)
-        (import ./overlays/libcamera.nix)
+        (import ./overlays/default.nix)
        (
          final: prev: {
            unstable = import inputs.nixpkgs-unstable { system = final.system; };
@@ -123,7 +120,7 @@
        mail = mkNixosSystem { system = "x86_64-linux"; name = "mail"; };
        odyssey = mkNixosSystem { system = "x86_64-linux"; name = "odyssey"; };
        pi = mkNixosSystem { system = "aarch64-linux"; name = "pi"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
-        skycam = mkNixosSystem { system = "aarch64-linux"; name = "skycam"; extraModules = [ inputs.raspberry-pi-nix.nixosModules.raspberry-pi ]; };
+        skycam = mkNixosSystem { system = "aarch64-linux"; name = "skycam"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
        vps1 = mkNixosSystem { system = "x86_64-linux"; name = "vps1"; };
      };

@@ -155,7 +152,7 @@
            };
          };
          pi = {
-            hostname = "10.0.1.191";
+            hostname = "pi.mesh.vimium.net";

            profiles.system = {
              user = "root";
@@ -163,7 +160,7 @@
            };
          };
          skycam = {
-            hostname = "10.0.1.146";
+            hostname = "skycam.mesh.vimium.net";

            profiles.system = {
              user = "root";
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -45,10 +45,11 @@
    buildMachines = [
      {
        hostName = "10.0.1.79";
-        sshUser = "builder";
+        sshUser = "root";
        system = "aarch64-linux";
        maxJobs = 6;
        speedFactor = 1;
+        supportedFeatures = [ "big-parallel" "benchmark" ];
      }
    ];
    distributedBuilds = true;
@@ -62,12 +63,10 @@
      auto-optimise-store = true;
      substituters = [
        "http://odyssey.mesh.vimium.net"
-        "https://nix-community.cachix.org"
        "https://cache.nixos.org"
      ];
      trusted-public-keys = [
        "odyssey.mesh.vimium.net:ZhQhjscPWjoN4rlZwoMELznEiBnZ9O26iyGA27ibilQ="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
      ];
    };
    gc = {
--- a/hosts/skycam/README.md
+++ b/hosts/skycam/README.md
@@ -20,3 +20,10 @@ SD card | `/dev/mmcblk0` (ext4, NixOS Root)
 ## Devices and connections
 - Camera Module 3 with wide-angle lens

+## Building
+To generate a compressed SD card image for Skycam, run:
+`nix build '.#nixosConfigurations.skycam.config.system.build.sdImage'`
+
+Once a card is imaged, the existing SSH host keys should be copied to
+`/etc/ssh` manually to enable secret decryption.
+
--- a/hosts/skycam/default.nix
+++ b/hosts/skycam/default.nix
@@ -6,11 +6,55 @@
    ../server.nix
  ];

-  raspberry-pi-nix = {
-    board = "bcm2711";
-    libcamera-overlay.enable = false;
+  hardware = {
+    raspberry-pi."4" = {
+      apply-overlays-dtmerge.enable = true;
+      audio.enable = false;
+      xhci.enable = false;
+    };
+    deviceTree = {
+      enable = true;
+      filter = "*rpi-4-*.dtb";
+      # From https://github.com/Electrostasy/dots/blob/3b81723feece67610a252ce754912f6769f0cd34/hosts/phobos/klipper.nix#L43-L65
+      overlays =
+        let
+          mkCompatibleDtsFile = dtbo:
+            let
+              drv = pkgs.runCommand "fix-dts" { nativeBuildInputs = with pkgs; [ dtc gnused ]; } ''
+                mkdir "$out"
+                dtc -I dtb -O dts ${dtbo} | sed -e 's/bcm2835/bcm2711/' > $out/overlay.dts
+              '';
+            in
+              "${drv}/overlay.dts";
+
+          inherit (config.boot.kernelPackages) kernel;
+        in
+          [
+            {
+              name = "imx708.dtbo";
+              dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/imx708.dtbo";
+            }
+            {
+              name = "vc4-kms-v3d-pi4.dtbo";
+              dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/vc4-kms-v3d-pi4.dtbo";
+            }
+          ];
+    };
+    firmware = with pkgs; [
+      firmwareLinuxNonfree
+    ];
  };

+  services.udev.extraRules = ''
+    SUBSYSTEM=="rpivid-*", GROUP="video", MODE="0660"
+    KERNEL=="vcsm-cma", GROUP="video", MODE="0660"
+    SUBSYSTEM=="dma_heap", GROUP="video", MODE="0660"
+  '';
+
+  nixpkgs.overlays = [
+    (import ./../../overlays/libcamera.nix)
+  ];
+
  networking = {
    hostId = "731d1660";
    firewall = {
@@ -41,7 +85,7 @@
        --resolution=4608x2592
      '';
      DynamicUser = "yes";
-      SupplementaryGroups = [ "video" "i2c" ];
+      SupplementaryGroups = [ "video" ];
      Restart = "always";
      RestartSec = 10;
    };
@@ -50,6 +94,7 @@
  };

  environment.systemPackages = with pkgs; [
+    camera-streamer
    git
    neovim
    libcamera
--- a/hosts/skycam/hardware-configuration.nix
+++ b/hosts/skycam/hardware-configuration.nix
@@ -1,6 +1,27 @@
 { config, lib, modulesPath, ... }:

 {
+  imports = [
+    (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
+  ];
+
+  boot = {
+    kernelModules = [ "bcm2835-v4l2" ];
+    kernelParams = [
+      "cma=512M"
+      "panic=0"
+    ];
+    supportedFilesystems = lib.mkForce [ "f2fs" "vfat" "xfs" ];
+    tmp.cleanOnBoot = false;
+  };
+
+  nixpkgs.overlays = [
+    (final: super: {
+      makeModulesClosure = x:
+        super.makeModulesClosure (x // { allowMissing = true; });
+    })
+  ];
+
  fileSystems = {
    "/" = {
      device = "/dev/disk/by-label/NIXOS_SD";
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -36,7 +36,7 @@ with lib;
      in {
        inherit name;
        isNormalUser = true;
-        extraGroups = [ "networkmanager" "wheel" "lxd" "video" ];
+        extraGroups = [ "networkmanager" "wheel" "lxd" ];
        description = "Jordan Holt";
        useDefaultShell = true;
        openssh.authorizedKeys.keys = [
--- a/modules/services/nginx/default.nix
+++ b/modules/services/nginx/default.nix
@@ -82,6 +82,13 @@ in {
        worker_connections 20000;
        multi_accept off;
      '';
+      proxyCachePath = {
+        "skycam" = {
+          enable = true;
+          keysZoneName = "skycam_cache";
+          maxSize = "100m";
+        };
+      };
      virtualHosts = {
        ## Static sites
        "jellyfin.vimium.com" = {
@@ -105,6 +112,21 @@ in {
            '';
          };
        };
+        "jdholt.com" = {
+          forceSSL = true;
+          enableACME = true;
+          serverAliases = [ "www.jdholt.com" ];
+          extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
+          locations."/skycam/snapshot.jpg" = {
+            proxyPass = "http://skycam.mesh.vimium.net:8080/snapshot";
+            extraConfig = ''
+              proxy_cache skycam_cache;
+              proxy_cache_valid any 10s;
+              proxy_ignore_headers Cache-Control Expires Set-Cookie;
+            '';
+          };
+          locations."/".return = "301 https://vimium.com$request_uri";
+        };
        "pki.vimium.com" = {
          addSSL = true;
          forceSSL = false;
@@ -142,7 +164,6 @@ in {
      ## Redirects
      // (mkRedirect "h0lt.com" "jdholt.com")
      // (mkRedirect "jordanholt.xyz" "jdholt.com")
-      // (mkRedirect "jdholt.com" "vimium.com")
      // (mkRedirect "omnimagic.com" "vimium.com")
      // (mkRedirect "omnimagic.net" "vimium.com")
      // (mkRedirect "thelostlegend.com" "suhailhussain.com")
--- a/overlays/0001-Always-installed.patch
+++ b/overlays/0001-Always-installed.patch
@@ -1,32 +0,0 @@
-From ff76624c4407c6132cd4068e6ce065a7b429351f Mon Sep 17 00:00:00 2001
-From: Jordan Holt <jordan@vimium.com>
-Date: Sun, 4 Aug 2024 15:46:04 +0100
-Subject: [PATCH] Always installed
-
---
- src/libcamera/source_paths.cpp | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/src/libcamera/source_paths.cpp b/src/libcamera/source_paths.cpp
-index 1af5386a..3fc7d044 100644
--- a/src/libcamera/source_paths.cpp
-+++ b/src/libcamera/source_paths.cpp
-@@ -39,15 +39,6 @@ namespace {
-  */
- bool isLibcameraInstalled()
- {
-	/*
-	 * DT_RUNPATH (DT_RPATH when the linker uses old dtags) is removed on
-	 * install.
-	 */
-	for (const ElfW(Dyn) *dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) {
-		if (dyn->d_tag == DT_RUNPATH || dyn->d_tag == DT_RPATH)
-			return false;
-	}
-
- 	return true;
- }
- 
-- 
-2.44.1
-
--- a/overlays/0001-Ignore-IPA-signing.patch
+++ b/overlays/0001-Ignore-IPA-signing.patch
@@ -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
+
--- a/overlays/libcamera.nix
+++ b/overlays/libcamera.nix
@@ -7,6 +7,7 @@ final: prev:

    patches = [
      ./0001-Remove-relative-config-lookups.patch
+      ./0001-Ignore-IPA-signing.patch
    ];

    mesonFlags = old.mesonFlags ++ [
--- a/pkgs/camera-streamer/0001-Disable-libdatachannel.patch
+++ b/pkgs/camera-streamer/0001-Disable-libdatachannel.patch
@@ -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
+
--- 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 \
Author	SHA1	Message	Date
Jordan Holt	1cb6482106	Fix udev rules on skycam All checks were successful Check flake / build-amd64-linux (push) Successful in 2m32s Details	2024-08-10 21:53:25 +01:00
Jordan Holt	3323f930d3	Add camera-streamer package to skycam	2024-08-10 21:53:09 +01:00
Jordan Holt	37d56b613e	Patch out IPA signature validation in libcamera	2024-08-10 21:52:45 +01:00
Jordan Holt	6205824c0d	Re-add default overlay	2024-08-10 21:52:20 +01:00
Jordan Holt	b613c266ed	Patch out libdatachannel in camera-streamer	2024-08-10 21:51:35 +01:00
Jordan Holt	c9fa49b24d	Update deployment hostnames All checks were successful Check flake / build-amd64-linux (push) Successful in 45m16s Details	2024-08-09 22:06:19 +01:00
Jordan Holt	064f180528	Apply libcamera overlay to skycam only	2024-08-09 21:54:40 +01:00
Jordan Holt	3f36be6cb7	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/883180e6550c1723395a3a342f830bfc5c371f6b' (2024-08-05) → 'github:NixOS/nixpkgs/21cc704b5e918c5fbf4f9fff22b4ac2681706d90' (2024-08-06) • Updated input 'plasma-manager': 'github:nix-community/plasma-manager/5ab818b79ba5c6651209cc1c1d19afe6c9046ed4' (2024-08-08) → 'github:nix-community/plasma-manager/22bea90404c5ff6457913a03c1a54a3caa5b1c57' (2024-08-09)	2024-08-09 21:43:39 +01:00
Jordan Holt	ab23bb3b76	Merge branch 'skycam' Some checks failed Check flake / build-amd64-linux (push) Failing after 0s Details	2024-08-09 21:41:28 +01:00
Jordan Holt	533397fc21	Proxy skycam snapshot on jdholt.com	2024-08-09 21:41:01 +01:00
Jordan Holt	7943e063c2	Prevent skycam reboot on panic	2024-08-09 20:03:42 +01:00
Jordan Holt	91d66003aa	Add build instructions for skycam to README	2024-08-09 19:36:15 +01:00
Jordan Holt	ecf34dbc89	Remove jdholt.com redirect	2024-08-09 19:05:01 +01:00
Jordan Holt	08c9a6ae19	flake.lock: Update Some checks failed Check flake / build-amd64-linux (push) Failing after 0s Details Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/0257e44f4ad472b54f19a6dd1615aee7fa48ed49' (2024-08-05) → 'github:nix-community/disko/ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed' (2024-08-08) • Updated input 'firefox-gnome-theme': 'github:rafaelmardojai/firefox-gnome-theme/cc70ec20e2775df7cd2bccdd20dcdecc3e0a733b' (2024-07-18) → 'github:rafaelmardojai/firefox-gnome-theme/fb5b578a4f49ae8705e5fea0419242ed1b8dba70' (2024-08-08) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/14c333162ba53c02853add87a0000cbd7aa230c2' (2024-07-30) → 'github:NixOS/nixos-hardware/107bb46eef1f05e86fc485ee8af9b637e5157988' (2024-08-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8b5b6723aca5a51edf075936439d9cd3947b7b2c' (2024-08-04) → 'github:NixOS/nixpkgs/883180e6550c1723395a3a342f830bfc5c371f6b' (2024-08-05) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/d04953086551086b44b6f3c6b7eeb26294f207da' (2024-08-02) → 'github:NixOS/nixpkgs/cb9a96f23c491c081b38eab96d22fa958043c9fa' (2024-08-04) • Updated input 'nixvim': 'github:nix-community/nixvim/4e6974c619bd280789ef3697a73fcf7c20f70819' (2024-08-03) → 'github:nix-community/nixvim/170df9814c3e41d5a4d6e3339e611801b1f02ce2' (2024-08-06) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/f451c19376071a90d8c58ab1a953c6e9840527fd' (2024-07-15) → 'github:cachix/git-hooks.nix/06939f6b7ec4d4f465bf3132a05367cccbbf64da' (2024-08-05) • Updated input 'nixvim/nix-darwin': 'github:lnl7/nix-darwin/f7142b8024d6b70c66fd646e1d099d3aa5bfec49' (2024-08-02) → 'github:lnl7/nix-darwin/91010a5613ffd7ee23ee9263213157a1c422b705' (2024-08-06) • Updated input 'plasma-manager': 'github:nix-community/plasma-manager/61d9342fb471cd3c45a047406428fba7b6fb49ad' (2024-08-04) → 'github:nix-community/plasma-manager/5ab818b79ba5c6651209cc1c1d19afe6c9046ed4' (2024-08-08)	2024-08-08 23:23:33 +01:00
Jordan Holt	0c564903ab	Fix ustreamer	2024-08-06 08:58:05 +01:00
Jordan Holt	ad9f4e52ef	Revert "Update rpi base" This reverts commit `5903eb650a`.	2024-08-06 08:29:32 +01:00
Jordan Holt	a96d5a9aeb	Remote builder uses root	2024-08-05 19:48:30 +01:00
Jordan Holt	d57d70bbbf	Add supportedFeatures to aarch64builder Some checks failed Check flake / build-amd64-linux (push) Failing after 0s Details	2024-08-05 19:06:03 +01:00