mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-09 14:33:22 +00:00
571c71e6f7
We are migrating packages that meet below requirements: 1. using `callPackage` 2. called path is a directory 3. overriding set is empty (`{ }`) 4. not containing path expressions other than relative path (to makenixpkgs-vet happy) 5. not referenced by nix files outside of the directory, other than`pkgs/top-level/all-packages.nix` 6. not referencing nix files outside of the directory 7. not referencing `default.nix` (since it's changed to `package.nix`) 8. `outPath` doesn't change after migration The tool is here: https://github.com/Aleksanaa/by-name-migrate.
14 lines
566 B
Diff
14 lines
566 B
Diff
diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py
|
|
index 50e2c9f..46e7f61 100755
|
|
--- a/src/you_get/processor/ffmpeg.py
|
|
+++ b/src/you_get/processor/ffmpeg.py
|
|
@@ -31,7 +31,7 @@ def get_usable_ffmpeg(cmd):
|
|
except:
|
|
return None
|
|
|
|
-FFMPEG, FFPROBE, FFMPEG_VERSION = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv') or (None, None, None)
|
|
+FFMPEG, FFPROBE, FFMPEG_VERSION = ('@ffmpeg@', '@ffprobe@', '@version@')
|
|
if logging.getLogger().isEnabledFor(logging.DEBUG):
|
|
LOGLEVEL = ['-loglevel', 'info']
|
|
STDIN = None
|