From 6600862e02d676c1daf790612516073e07341b56 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Tue, 4 Nov 2025 23:19:05 -0600 Subject: [PATCH] octavePackages.video: Fix build & install video uses a slightly different build system from other packages. It uses an autotools bootstrap script to generate a configure script that detects the ffmpeg necessities. HOWEVER, we notably do not actually run the Makefile that the configure script generates! This pre-build step only creates a "release tarball"! Octave compiles this "release tarball" in buildOctavePackage's normal buildPhase with "octave-cli --eval 'pkg build ...'". --- .../octave-modules/video/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/octave-modules/video/default.nix b/pkgs/development/octave-modules/video/default.nix index 94a4553b598d..590aeea1d705 100644 --- a/pkgs/development/octave-modules/video/default.nix +++ b/pkgs/development/octave-modules/video/default.nix @@ -4,7 +4,9 @@ lib, fetchFromGitHub, pkg-config, - ffmpeg, + autoconf, + automake, + ffmpeg_7, }: buildOctavePackage rec { @@ -14,16 +16,28 @@ buildOctavePackage rec { src = fetchFromGitHub { owner = "Andy1978"; repo = "octave-video"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-fn9LNfuS9dSStBfzBjRRkvP50JJ5K+Em02J9+cHqt6w="; }; + preBuild = '' + pushd src + patchShebangs bootstrap configure + ./bootstrap + ./configure + popd + + tar --transform 's,^,video-${version}/,' -cz * -f video-${version}.tar.gz + ''; + nativeBuildInputs = [ pkg-config + autoconf + automake ]; propagatedBuildInputs = [ - ffmpeg + ffmpeg_7 ]; meta = {