diff options
| author | Robert Schütz <nix@dotlambda.de> | 2022-06-01 01:05:35 +0000 |
|---|---|---|
| committer | Robert Schütz <github@dotlambda.de> | 2022-06-01 10:01:42 -0700 |
| commit | 575b761b396d23574471d05b3d02b75b6f7dd2d8 (patch) | |
| tree | 2a5a783119e15ced64c653b1bdcdd4ac1b955ac1 /pkgs/tools/misc/you-get | |
| parent | 99d0d5f1dbb2d710858ea9303644a6a63592dea6 (diff) | |
| download | nixpkgs-575b761b396d23574471d05b3d02b75b6f7dd2d8.tar nixpkgs-575b761b396d23574471d05b3d02b75b6f7dd2d8.tar.gz nixpkgs-575b761b396d23574471d05b3d02b75b6f7dd2d8.tar.bz2 nixpkgs-575b761b396d23574471d05b3d02b75b6f7dd2d8.tar.lz nixpkgs-575b761b396d23574471d05b3d02b75b6f7dd2d8.tar.xz nixpkgs-575b761b396d23574471d05b3d02b75b6f7dd2d8.tar.zst nixpkgs-575b761b396d23574471d05b3d02b75b6f7dd2d8.zip | |
you-get: hardcode ffmpeg path
Diffstat (limited to 'pkgs/tools/misc/you-get')
| -rw-r--r-- | pkgs/tools/misc/you-get/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/tools/misc/you-get/ffmpeg-path.patch | 13 |
2 files changed, 30 insertions, 4 deletions
diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index f5732847452..32d5b5712da 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -1,6 +1,11 @@ -{ lib, buildPythonApplication, fetchPypi, installShellFiles }: +{ lib +, python3 +, substituteAll +, ffmpeg +, installShellFiles +}: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "you-get"; version = "0.4.1612"; @@ -8,11 +13,20 @@ buildPythonApplication rec { # probably aren't suitable for a build environment anyway. doCheck = false; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "sha256-lKEztwwn1pnALuwDiA1Ik9+XCVyO+UMobv+hXu0mn5w="; }; + patches = [ + (substituteAll { + src = ./ffmpeg-path.patch; + ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg"; + ffprobe = "${lib.getBin ffmpeg}/bin/ffmpeg"; + version = lib.getVersion ffmpeg; + }) + ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -25,7 +39,6 @@ buildPythonApplication rec { meta = with lib; { description = "A tiny command line utility to download media contents from the web"; homepage = "https://you-get.org"; - changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ryneeverett ]; }; diff --git a/pkgs/tools/misc/you-get/ffmpeg-path.patch b/pkgs/tools/misc/you-get/ffmpeg-path.patch new file mode 100644 index 00000000000..abbd0be9d3e --- /dev/null +++ b/pkgs/tools/misc/you-get/ffmpeg-path.patch @@ -0,0 +1,13 @@ +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 |