diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-05-02 18:56:19 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-05-02 18:56:19 +0200 |
commit | 0d5ff13701010f6bd11adb9c8f6201d0524dd402 (patch) | |
tree | 774061c5ef2564ba7f8cf8410cd90b759c394b37 | |
parent | f03fdb0f56be4e9bcd203be0315fd54ad50de330 (diff) | |
parent | 1a350e6b583786c5d45b9d2a2987b82e3c5e08e2 (diff) | |
download | nixlib-0d5ff13701010f6bd11adb9c8f6201d0524dd402.tar nixlib-0d5ff13701010f6bd11adb9c8f6201d0524dd402.tar.gz nixlib-0d5ff13701010f6bd11adb9c8f6201d0524dd402.tar.bz2 nixlib-0d5ff13701010f6bd11adb9c8f6201d0524dd402.tar.lz nixlib-0d5ff13701010f6bd11adb9c8f6201d0524dd402.tar.xz nixlib-0d5ff13701010f6bd11adb9c8f6201d0524dd402.tar.zst nixlib-0d5ff13701010f6bd11adb9c8f6201d0524dd402.zip |
beets: Merge pull request #15165: Fix ffmpeg call
This patches the ffmpeg command path so that it will work without ffmpeg being in the user's current path. The commit contains a suggestion from me to patch command_output() instead of just replacing "ffmpeg" so that if a user configuration alters the default commands it will still work.
-rw-r--r-- | pkgs/tools/audio/beets/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 0079270e29fa..806cb07c610f 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -4,6 +4,7 @@ , enableAcousticbrainz ? true , enableAcoustid ? true , enableBadfiles ? true, flac ? null, mp3val ? null +, enableConvert ? true, ffmpeg ? null , enableDiscogs ? true , enableEchonest ? true , enableEmbyupdate ? true @@ -22,6 +23,7 @@ assert enableAcoustid -> pythonPackages.pyacoustid != null; assert enableBadfiles -> flac != null && mp3val != null; +assert enableConvert -> ffmpeg != null; assert enableDiscogs -> pythonPackages.discogs_client != null; assert enableEchonest -> pythonPackages.pyechonest != null; assert enableFetchart -> pythonPackages.responses != null; @@ -38,6 +40,7 @@ let acousticbrainz = enableAcousticbrainz; badfiles = enableBadfiles; chroma = enableAcoustid; + convert = enableConvert; discogs = enableDiscogs; echonest = enableEchonest; embyupdate = enableEmbyupdate; @@ -52,7 +55,7 @@ let }; pluginsWithoutDeps = [ - "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "edit" "embedart" + "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics" "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "permissions" "play" @@ -96,6 +99,7 @@ in buildPythonApplication rec { || enableEmbyupdate || enableAcousticbrainz) pythonPackages.requests2 + ++ optional enableConvert ffmpeg ++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableEchonest pythonPackages.pyechonest ++ optional enableLastfm pythonPackages.pylast @@ -131,6 +135,8 @@ in buildPythonApplication rec { s,"flac","${flac.bin}/bin/flac", s,"mp3val","${mp3val}/bin/mp3val", }' beetsplug/badfiles.py + '' + optionalString enableConvert '' + sed -i -e 's,\(util\.command_output(\)\([^)]\+\)),\1[b"${ffmpeg.bin}/bin/ffmpeg" if args[0] == b"ffmpeg" else args[0]] + \2[1:]),' beetsplug/convert.py '' + optionalString enableReplaygain '' sed -i -re ' s!^( *cmd *= *b?['\'''"])(bs1770gain['\'''"])!\1${bs1770gain}/bin/\2! |