mirror of
https://github.com/aviallon/nixos-lib.git
synced 2026-04-06 01:38:06 +00:00
[Packages+Optimizations] Use bleeding-edge ffmpeg-full, enable unfree codecs and add optimizations if enabled
This commit is contained in:
parent
8ec15b97a5
commit
abfcde5e8b
2 changed files with 10 additions and 5 deletions
|
|
@ -201,6 +201,11 @@ in
|
||||||
recursive = 1;
|
recursive = 1;
|
||||||
parallelize = generalCfg.cores;
|
parallelize = generalCfg.cores;
|
||||||
} super.optipng;
|
} super.optipng;
|
||||||
|
myFFmpeg = optimizePkg {
|
||||||
|
level = "normal";
|
||||||
|
lto = false;
|
||||||
|
recursive = 1;
|
||||||
|
} super.myFFmpeg;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
10
overlays.nix
10
overlays.nix
|
|
@ -88,11 +88,9 @@ in
|
||||||
});
|
});
|
||||||
|
|
||||||
myFFmpeg = let
|
myFFmpeg = let
|
||||||
withLto = super.ffmpeg-full.override { enableLto = false; rav1e = self.rav1e; };
|
withUnfree = super.unstable.ffmpeg-full.override { withUnfree = true; };
|
||||||
withTensorflow = withLto.overrideAttrs (old: {
|
withTensorflow = withUnfree.overrideAttrs (old: {
|
||||||
CFLAGS = (old.CFLAGS or "") + " -march=${config.aviallon.general.cpuArch}";
|
buildInputs = (old.buildInputs or []) ++ [ super.libtensorflow ];
|
||||||
LDFLAGS = (old.LDFLAGS or "") + " -march=${config.aviallon.general.cpuArch}";
|
|
||||||
buildInputs = (old.buildInputs or []) ++ [ super.libtensorflow-bin ];
|
|
||||||
configureFlags = (old.configureFlags or []) ++ [ "--enable-libtensorflow" ];
|
configureFlags = (old.configureFlags or []) ++ [ "--enable-libtensorflow" ];
|
||||||
});
|
});
|
||||||
in withTensorflow;
|
in withTensorflow;
|
||||||
|
|
@ -121,6 +119,8 @@ in
|
||||||
"unrar" "ark"
|
"unrar" "ark"
|
||||||
"chromium-unwrapped" "chrome-widevine-cdm"
|
"chromium-unwrapped" "chrome-widevine-cdm"
|
||||||
"ungoogled-chromium" "chromium" # because of widevine
|
"ungoogled-chromium" "chromium" # because of widevine
|
||||||
|
|
||||||
|
"ffmpeg-full" # Because of unfree codecs
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue