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`.
21 lines
901 B
Diff
21 lines
901 B
Diff
diff --git i/beets/util/artresizer.py w/beets/util/artresizer.py
|
|
index 8683e228..2f38b4d6 100644
|
|
--- i/beets/util/artresizer.py
|
|
+++ w/beets/util/artresizer.py
|
|
@@ -334,13 +334,8 @@ class ArtResizer(metaclass=Shareable):
|
|
# not, fall back to the older, separate convert and identify
|
|
# commands.
|
|
if self.method[0] == IMAGEMAGICK:
|
|
- self.im_legacy = self.method[2]
|
|
- if self.im_legacy:
|
|
- self.im_convert_cmd = ['convert']
|
|
- self.im_identify_cmd = ['identify']
|
|
- else:
|
|
- self.im_convert_cmd = ['magick']
|
|
- self.im_identify_cmd = ['magick', 'identify']
|
|
+ self.im_convert_cmd = ['@imagemagick@/bin/magick']
|
|
+ self.im_identify_cmd = ['@imagemagick@/bin/magick', 'identify']
|
|
|
|
def resize(
|
|
self, maxwidth, path_in, path_out=None, quality=0, max_filesize=0
|