From 191a7e87f471356ca29992fe6437a04356f5672d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 30 Apr 2025 18:54:39 +0200
Subject: [PATCH 1/2] libpisp: init at 1.2.1

Wanted by libcamera.  Seems easier to just package it than disable it
in libcamera, as that would require copying the list of which
pipelines to enable on which architectures into Nixpkgs.
---
 pkgs/by-name/li/libpisp/package.nix | 39 +++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/li/libpisp/package.nix

diff --git a/pkgs/by-name/li/libpisp/package.nix b/pkgs/by-name/li/libpisp/package.nix
new file mode 100644
index 000000000000..2a9dd59d2d46
--- /dev/null
+++ b/pkgs/by-name/li/libpisp/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  meson,
+  ninja,
+  boost,
+  nlohmann_json,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libpisp";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "libpisp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YshU7G5Rov67CVwFbf5ENp2j5ptAvkVrlMu85KmnEpk=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+  ];
+  buildInputs = [
+    boost
+    nlohmann_json
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/raspberrypi/libpisp";
+    description = "A helper library to generate run-time configuration for the Raspberry Pi ISP (PiSP), consisting of the Frontend and Backend hardware components.";
+    license = licenses.bsd2;
+    platforms = platforms.all;
+  };
+})

From 8fcd9969943e268457049d5371b2885063423805 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 30 Apr 2025 18:55:21 +0200
Subject: [PATCH 2/2] libcamera: fix build on aarch64

Fixes: 3a83abf73ff3 ("libcamera: 0.4.0 -> 0.5.0")
---
 pkgs/by-name/li/libcamera/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix
index b7c8b300b151..323d49b427c3 100644
--- a/pkgs/by-name/li/libcamera/package.nix
+++ b/pkgs/by-name/li/libcamera/package.nix
@@ -17,6 +17,7 @@
   python3,
   python3Packages,
   systemd, # for libudev
+  libpisp,
   withTracing ? lib.meta.availableOn stdenv.hostPlatform lttng-ust,
   lttng-ust, # withTracing
   withQcam ? false,
@@ -85,6 +86,7 @@ stdenv.mkDerivation rec {
 
       gtest
     ]
+    ++ lib.optionals stdenv.hostPlatform.isAarch [ libpisp ]
     ++ lib.optionals withTracing [ lttng-ust ]
     ++ lib.optionals withQcam [
       libtiff