[Desktop/Multimedia] use upstream ffmpeg tensorflow flag, except if libtensorflow marked as broken

This commit is contained in:
Antoine Viallon 2023-10-31 14:46:44 +01:00
parent 3115818fbd
commit e593e970a3
Signed by: aviallon
GPG key ID: 186FC35EDEB25716

View file

@ -11,12 +11,11 @@ let
# Multimedia Packages # Multimedia Packages
myFFmpeg = let myFFmpeg = let
withUnfree = pkgs.unstable.ffmpeg-full.override { withUnfree = true; }; withUnfree = pkgs.unstable.ffmpeg-full.override {
withTensorflow = withUnfree.overrideAttrs (old: { withUnfree = true;
buildInputs = (old.buildInputs or []) ++ [ pkgs.libtensorflow ]; withTensorflow = !pkgs.unstable.libtensorflow.meta.broken;
configureFlags = (old.configureFlags or []) ++ [ "--enable-libtensorflow" ]; };
}); in withUnfree;
in withTensorflow;
myFFmpeg_opt = config.aviallon.optimizations.optimizePkg { lto = false; } myFFmpeg; myFFmpeg_opt = config.aviallon.optimizations.optimizePkg { lto = false; } myFFmpeg;