mirror of
https://github.com/nix-community/raspberry-pi-nix.git
synced 2025-11-08 19:46:03 +01:00
Fix libcamera build
This backports the `postPatch` change from nixpkgs to the libcamera overlay so the build doesn't break, and also changes the rpicam-apps overlay so it builds properly now. The version in the libcamera overlay has been fixed to match upstream.
This commit is contained in:
parent
be1defc74e
commit
9d173a9416
2 changed files with 18 additions and 14 deletions
|
|
@ -3,8 +3,7 @@
|
|||
, libpisp-src
|
||||
, ...
|
||||
}:
|
||||
final: prev:
|
||||
{
|
||||
final: prev: {
|
||||
# A recent known working version of rpicam-apps
|
||||
libcamera-apps =
|
||||
final.callPackage ./rpicam-apps.nix { inherit rpicam-apps-src; };
|
||||
|
|
@ -22,7 +21,7 @@ final: prev:
|
|||
};
|
||||
|
||||
libcamera = prev.libcamera.overrideAttrs (old: {
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
src = libcamera-src;
|
||||
buildInputs = old.buildInputs ++ (with final; [
|
||||
libpisp openssl libtiff
|
||||
|
|
@ -30,9 +29,11 @@ final: prev:
|
|||
python3-gnutls pybind11 pyyaml ply
|
||||
]))
|
||||
libglibutil gst_all_1.gst-plugins-base
|
||||
|
||||
]);
|
||||
patches = [ ];
|
||||
postPatch = ''
|
||||
patchShebangs src/py/ utils/
|
||||
'';
|
||||
mesonFlags = [
|
||||
"--buildtype=release"
|
||||
"-Dpipelines=rpi/vc4,rpi/pisp"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue