Update rpi base
This commit is contained in:
32
overlays/0001-Always-installed.patch
Normal file
32
overlays/0001-Always-installed.patch
Normal file
@ -0,0 +1,32 @@
|
||||
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
|
||||
|
48
overlays/libcamera.nix
Normal file
48
overlays/libcamera.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ libcamera-src
|
||||
, libpisp-src
|
||||
, ...
|
||||
}:
|
||||
final: prev:
|
||||
{
|
||||
libpisp = final.stdenv.mkDerivation {
|
||||
name = "libpisp";
|
||||
version = "1.0.6";
|
||||
src = libpisp-src;
|
||||
nativeBuildInputs = with final; [ pkg-config meson ninja ];
|
||||
buildInputs = with final; [ nlohmann_json boost ];
|
||||
# Meson is no longer able to pick up Boost automatically.
|
||||
# https://github.com/NixOS/nixpkgs/issues/86131
|
||||
BOOST_INCLUDEDIR = "${prev.lib.getDev final.boost}/include";
|
||||
BOOST_LIBRARYDIR = "${prev.lib.getLib final.boost}/lib";
|
||||
};
|
||||
|
||||
libcamera = prev.libcamera.overrideAttrs (old: {
|
||||
version = "0.2.0";
|
||||
src = libcamera-src;
|
||||
buildInputs = old.buildInputs ++ (with final; [
|
||||
libpisp openssl libtiff
|
||||
(python3.withPackages (ps: with ps; [
|
||||
python3-gnutls pybind11 pyyaml ply
|
||||
]))
|
||||
libglibutil gst_all_1.gst-plugins-base
|
||||
]);
|
||||
patches = [ ./0001-Always-installed.patch ];
|
||||
postPatch = ''
|
||||
patchShebangs utils/
|
||||
patchShebangs src/py/
|
||||
'';
|
||||
mesonFlags = [
|
||||
"--buildtype=release"
|
||||
"-Dpipelines=rpi/vc4,rpi/pisp"
|
||||
"-Dipas=rpi/vc4,rpi/pisp"
|
||||
"-Dv4l2=true"
|
||||
"-Dgstreamer=enabled"
|
||||
"-Dtest=false"
|
||||
"-Dlc-compliance=disabled"
|
||||
"-Dcam=disabled"
|
||||
"-Dqcam=disabled"
|
||||
"-Ddocumentation=enabled"
|
||||
"-Dpycamera=enabled"
|
||||
];
|
||||
});
|
||||
}
|
Reference in New Issue
Block a user