sky1e/subtitle-merge
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Make nix package properly depend on mkvtoolnix-cli

Browse source
This commit is contained in:
Skye 2024-11-14 17:05:17 -05:00
parent c642e25256
commit 71256b7ff4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

@ -20,8 +20,9 @@
src = ./.; src = ./.;
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
buildInputs = builtins.attrValues { buildInputs = builtins.attrValues {
inherit (final) installShellFiles mkvtoolnix-cli; inherit (final) installShellFiles;
}; };
env.mkvmerge = "${final.mkvtoolnix-cli}/bin/mkvmerge";
postInstall = '' postInstall = ''
installShellCompletion --cmd subtitle-merge \ installShellCompletion --cmd subtitle-merge \

2
src/main.rs
View file

@ -111,7 +111,7 @@ fn convert_single(
find_files(source.parent().unwrap(), OsStr::new("ttf"))?.collect::<io::Result<_>>()? find_files(source.parent().unwrap(), OsStr::new("ttf"))?.collect::<io::Result<_>>()?
}; };
let mut command = Command::new("mkvmerge"); let mut command = Command::new(option_env!("mkvmerge").unwrap_or("mkvmerge"));
command.arg("--output").args([ command.arg("--output").args([
output.into_os_string(), output.into_os_string(),
source.into_os_string(), source.into_os_string(),