From ebcff4724139cb7f92da55033bafdb4f2245d3ad Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 29 Oct 2023 08:20:35 +1100 Subject: [PATCH] cmus: ffmpeg 6 compatibility fix --- pkgs/applications/audio/cmus/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index a3f859ca0ea4..88d0931ca104 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config +{ config, lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config , libiconv, CoreAudio, AudioUnit, VideoToolbox , alsaSupport ? stdenv.isLinux, alsa-lib ? null @@ -101,7 +101,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ha0bIh3SYMhA28YXQ//Loaz9J1lTJAzjTx8eK3AqUjM="; }; - patches = [ ./option-debugging.patch ]; + patches = [ + ./option-debugging.patch + # ffmpeg 6 fix https://github.com/cmus/cmus/pull/1254/ + (fetchpatch { url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch"; hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA="; }) + ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]