aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-06 01:38:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Desktop/Multimedia] don't directly overlay ffmpeg-full, only override for cmdline use

Browse source
This commit is contained in:
Antoine Viallon 2023-04-05 09:47:57 +02:00
parent 3ae50d2cc2
commit 8ec15b97a5
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop/multimedia.nix
View file

@ -9,7 +9,7 @@ let
in { in {
config = mkIf (cfg.enable && !generalCfg.minimal) { config = mkIf (cfg.enable && !generalCfg.minimal) {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
ffmpeg-full myFFmpeg
krita krita
obs-studio obs-studio
scribus scribus

2
overlays.nix
View file

@ -87,7 +87,7 @@ in
]; ];
}); });
ffmpeg-full = let myFFmpeg = let
withLto = super.ffmpeg-full.override { enableLto = false; rav1e = self.rav1e; }; withLto = super.ffmpeg-full.override { enableLto = false; rav1e = self.rav1e; };
withTensorflow = withLto.overrideAttrs (old: { withTensorflow = withLto.overrideAttrs (old: {
CFLAGS = (old.CFLAGS or "") + " -march=${config.aviallon.general.cpuArch}"; CFLAGS = (old.CFLAGS or "") + " -march=${config.aviallon.general.cpuArch}";