From 54719fedf20eb62ae17446470bb8deb5d96fec76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 01:39:35 +0000 Subject: [PATCH 1/2] octavePackages.image-acquisition: 0.2.2 -> 0.2.6 --- pkgs/development/octave-modules/image-acquisition/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/image-acquisition/default.nix b/pkgs/development/octave-modules/image-acquisition/default.nix index e1410fd8368f..b7591b17f7fe 100644 --- a/pkgs/development/octave-modules/image-acquisition/default.nix +++ b/pkgs/development/octave-modules/image-acquisition/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "image-acquisition"; - version = "0.2.2"; + version = "0.2.6"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "1amp6npkddnnz2i5rm6gvn65qrbn0nxzl2cja3dvc2xqg396wrhh"; + sha256 = "sha256-Uehwk68GZ/M4WL5M3GF++mCPUg3M08Y0gkdO36/yhNI="; }; buildInputs = [ From 6b8ae8a33c1338f8f9693b6fcb29578b27172af6 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Sun, 1 Sep 2024 11:01:33 -0500 Subject: [PATCH 2/2] octavePackages.image-acquisition: propagate libv4l to runtime libv4l is needed when running Octave with this package. Propagate the library input so the final Octave environment also contains libv4l. --- .../octave-modules/image-acquisition/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/octave-modules/image-acquisition/default.nix b/pkgs/development/octave-modules/image-acquisition/default.nix index b7591b17f7fe..69f7c1a60a54 100644 --- a/pkgs/development/octave-modules/image-acquisition/default.nix +++ b/pkgs/development/octave-modules/image-acquisition/default.nix @@ -15,10 +15,13 @@ buildOctavePackage rec { }; buildInputs = [ - libv4l fltk ]; + propagatedBuildInputs = [ + libv4l + ]; + meta = with lib; { homepage = "https://octave.sourceforge.io/image-acquisition/index.html"; license = licenses.gpl3Plus; @@ -28,7 +31,5 @@ buildOctavePackage rec { The Octave-forge Image Aquisition package provides functions to capture images from connected devices. Currently only v4l2 is supported. ''; - # Got broke with octave 8.x update, and wasn't updated since 2015 - broken = true; }; }