This commit is contained in:
Shelvacu
2024-12-21 00:22:51 -08:00
committed by Shelvacu on fw
parent 023b8c3375
commit 7074383536
4 changed files with 16 additions and 4 deletions

View File

@@ -48,6 +48,7 @@ else
./git.nix
./hpn.nix
./checks.nix
./ffmpeg.nix
];
options = {
vacu.rootCAs = mkOption { type = types.listOf types.str; };

11
common/ffmpeg.nix Normal file
View File

@@ -0,0 +1,11 @@
{
pkgs,
lib,
...
}:
{
vacu.packages.ffmpeg-allvrything = {
enable = lib.mkDefault false;
package = pkgs.ffmpeg_7-full.override(old: { libbluray = old.libbluray.override { withJava = true; withAACS = true; withBDplus = true; }; });
};
}

View File

@@ -30,14 +30,14 @@ let
packageListToSet = (
from:
let
enable = lib.mkOverride 900 true; #more important than mkDefault, less important than setting explicitly
keyvals = map (
val:
if builtins.isString val then
{
name = val;
value = {
package = pkgs."${val}";
enable = lib.mkDefault true;
inherit enable;
};
}
else
@@ -45,7 +45,7 @@ let
name = val.pname or val.name;
value = {
package = lib.mkDefault val;
enable = lib.mkDefault true;
inherit enable;
};
}
) from;

View File

@@ -46,7 +46,7 @@
vlc
dmidecode
prismlauncher
ffmpeg_7-full
"ffmpeg-allvrything"
wireshark
obsidian
dino