mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-01 01:57:37 +03:00
5b12a5ea1a
Refresh patches, remove keyfinder patch as upstream seems to use the correct keyfinder-cli path, since: https://github.com/beetbox/beets/pull/3467/files Remove the doing nothing `imagemagick` in `buildInputs` and add a patch that makes `beets` use `magick` from Nix' path. The patch can be disabled along with the reference to imagemagick if it's set to `null`. Formatting: use 1 line per input. Remove the unevaluated externalTestArgs.beets - it was moved to `all-packages.nix`.
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
diff --git i/beetsplug/convert.py w/beetsplug/convert.py
|
|
index 6bc07c28..039fb452 100644
|
|
--- i/beetsplug/convert.py
|
|
+++ w/beetsplug/convert.py
|
|
@@ -118,22 +118,22 @@ class ConvertPlugin(BeetsPlugin):
|
|
'id3v23': 'inherit',
|
|
'formats': {
|
|
'aac': {
|
|
- 'command': 'ffmpeg -i $source -y -vn -acodec aac '
|
|
+ 'command': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec aac '
|
|
'-aq 1 $dest',
|
|
'extension': 'm4a',
|
|
},
|
|
'alac': {
|
|
- 'command': 'ffmpeg -i $source -y -vn -acodec alac $dest',
|
|
+ 'command': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec alac $dest',
|
|
'extension': 'm4a',
|
|
},
|
|
- 'flac': 'ffmpeg -i $source -y -vn -acodec flac $dest',
|
|
- 'mp3': 'ffmpeg -i $source -y -vn -aq 2 $dest',
|
|
+ 'flac': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec flac $dest',
|
|
+ 'mp3': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -aq 2 $dest',
|
|
'opus':
|
|
- 'ffmpeg -i $source -y -vn -acodec libopus -ab 96k $dest',
|
|
+ '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec libopus -ab 96k $dest',
|
|
'ogg':
|
|
- 'ffmpeg -i $source -y -vn -acodec libvorbis -aq 3 $dest',
|
|
+ '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec libvorbis -aq 3 $dest',
|
|
'wma':
|
|
- 'ffmpeg -i $source -y -vn -acodec wmav2 -vn $dest',
|
|
+ '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec wmav2 -vn $dest',
|
|
},
|
|
'max_bitrate': 500,
|
|
'auto': False,
|