cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #142493 from NinjaTrappeur/nin/mpv-yt-dlp

Browse source
This commit is contained in:
Sandro 2021-10-21 20:55:07 +02:00 committed by GitHub
commit 2d7122a94e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/video/mpv/default.nix
View file

@ -112,6 +112,15 @@ in stdenv.mkDerivation rec {
url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch"; url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch";
sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx"; sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx";
}) })
# TOREMOVE when > 0.33.1
# youtube-dl has been abandonned and is now unusable w/
# youtube.com. Mpv migrated to yt-dlp since the 0.33.1 but did not
# cut a new release yet. See
# https://github.com/mpv-player/mpv/pull/9209
(fetchpatch {
url = "https://github.com/mpv-player/mpv/commit/d1c92bfd79ef81ac804fcc20aee2ed24e8d587aa.patch";
sha256 = "1dwxzng3gsrx0gjljm5jmfcjz3pzdss9z2l0n25rmmb4nbcrcx1f";
})
]; ];
postPatch = '' postPatch = ''

4
pkgs/applications/video/mpv/wrapper.nix
View file

@ -3,7 +3,7 @@
, lib , lib
, symlinkJoin , symlinkJoin
, makeWrapper , makeWrapper
, youtube-dl , yt-dlp
}: }:
# the unwrapped mpv derivation - 1st argument to `wrapMpv` # the unwrapped mpv derivation - 1st argument to `wrapMpv`
@ -25,7 +25,7 @@ let
binPath = lib.makeBinPath ([ binPath = lib.makeBinPath ([
mpv.luaEnv mpv.luaEnv
] ++ lib.optionals youtubeSupport [ ] ++ lib.optionals youtubeSupport [
youtube-dl yt-dlp
] ++ lib.optionals mpv.vapoursynthSupport [ ] ++ lib.optionals mpv.vapoursynthSupport [
mpv.vapoursynth.python3 mpv.vapoursynth.python3
]); ]);