From e593e970a30f5de617d090bec6f860475ea673f7 Mon Sep 17 00:00:00 2001 From: Antoine Viallon Date: Tue, 31 Oct 2023 14:46:44 +0100 Subject: [PATCH] [Desktop/Multimedia] use upstream ffmpeg tensorflow flag, except if libtensorflow marked as broken --- desktop/multimedia.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/desktop/multimedia.nix b/desktop/multimedia.nix index 24c09ad..25d4567 100644 --- a/desktop/multimedia.nix +++ b/desktop/multimedia.nix @@ -11,12 +11,11 @@ let # Multimedia Packages myFFmpeg = let - withUnfree = pkgs.unstable.ffmpeg-full.override { withUnfree = true; }; - withTensorflow = withUnfree.overrideAttrs (old: { - buildInputs = (old.buildInputs or []) ++ [ pkgs.libtensorflow ]; - configureFlags = (old.configureFlags or []) ++ [ "--enable-libtensorflow" ]; - }); - in withTensorflow; + withUnfree = pkgs.unstable.ffmpeg-full.override { + withUnfree = true; + withTensorflow = !pkgs.unstable.libtensorflow.meta.broken; + }; + in withUnfree; myFFmpeg_opt = config.aviallon.optimizations.optimizePkg { lto = false; } myFFmpeg;