From 8ec15b97a5514774fb7fc6392438cf88d52a6a66 Mon Sep 17 00:00:00 2001 From: Antoine Viallon Date: Wed, 5 Apr 2023 09:47:57 +0200 Subject: [PATCH] [Desktop/Multimedia] don't directly overlay ffmpeg-full, only override for cmdline use --- desktop/multimedia.nix | 2 +- overlays.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/multimedia.nix b/desktop/multimedia.nix index cdd7649..72e6e55 100644 --- a/desktop/multimedia.nix +++ b/desktop/multimedia.nix @@ -9,7 +9,7 @@ let in { config = mkIf (cfg.enable && !generalCfg.minimal) { environment.systemPackages = with pkgs; [ - ffmpeg-full + myFFmpeg krita obs-studio scribus diff --git a/overlays.nix b/overlays.nix index c595d01..2a66682 100644 --- a/overlays.nix +++ b/overlays.nix @@ -87,7 +87,7 @@ in ]; }); - ffmpeg-full = let + myFFmpeg = let withLto = super.ffmpeg-full.override { enableLto = false; rav1e = self.rav1e; }; withTensorflow = withLto.overrideAttrs (old: { CFLAGS = (old.CFLAGS or "") + " -march=${config.aviallon.general.cpuArch}";